[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/49] pc: Eliminate PcGuestInfo struct
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 37/49] pc: Eliminate PcGuestInfo struct |
Date: |
Thu, 4 Feb 2016 23:53:24 +0200 |
From: Eduardo Habkost <address@hidden>
The struct is not used for anything, now.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/pc.h | 7 +------
hw/i386/pc.c | 4 +---
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 0cf67ed..8b3546e 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -33,10 +33,6 @@
#define kvm_ioapic_in_kernel() 0
#endif
-/* Machine info for ACPI build: */
-struct PcGuestInfo {
-};
-
/**
* PCMachineState:
* @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling
@@ -49,7 +45,6 @@ struct PCMachineState {
/* State for other subsystems/APIs: */
MemoryHotplugState hotplug_memory;
- PcGuestInfo acpi_guest_info;
Notifier machine_done;
/* Pointers to devices and objects: */
@@ -233,7 +228,7 @@ void pc_cpus_init(PCMachineState *pcms);
void pc_hot_add_cpu(const int64_t id, Error **errp);
void pc_acpi_init(const char *default_dsdt);
-PcGuestInfo *pc_guest_info_init(PCMachineState *pcms);
+void pc_guest_info_init(PCMachineState *pcms);
#define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start"
#define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 66f7bb9..ce185bb 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1183,9 +1183,8 @@ void pc_machine_done(Notifier *notifier, void *data)
acpi_setup();
}
-PcGuestInfo *pc_guest_info_init(PCMachineState *pcms)
+void pc_guest_info_init(PCMachineState *pcms)
{
- PcGuestInfo *guest_info = &pcms->acpi_guest_info;
int i, j;
pcms->apic_id_limit = pc_apic_id_limit(max_cpus);
@@ -1213,7 +1212,6 @@ PcGuestInfo *pc_guest_info_init(PCMachineState *pcms)
pcms->machine_done.notify = pc_machine_done;
qemu_add_machine_init_done_notifier(&pcms->machine_done);
- return guest_info;
}
/* setup pci memory address space mapping into system address space */
--
MST
- [Qemu-devel] [PULL 26/49] pc: Move PcGuestInfo declaration to top of file, (continued)
- [Qemu-devel] [PULL 26/49] pc: Move PcGuestInfo declaration to top of file, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 27/49] pc: Eliminate struct PcGuestInfoState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 28/49] pc: Simplify pc_memory_init() signature, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 29/49] pc: Simplify xen_load_linux() signature, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 30/49] acpi: Remove guest_info parameters from functions, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 31/49] acpi: Don't save PcGuestInfo on AcpiBuildState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 32/49] pc: Remove compat fields from PcGuestInfo, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 34/49] pc: Remove PcGuestInfo.isapc_ram_fw field, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 35/49] pc: Move PcGuestInfo.fw_cfg to PCMachineState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 33/49] pc: Remove RAM size fields from PcGuestInfo, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 37/49] pc: Eliminate PcGuestInfo struct,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 36/49] pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 38/49] acpi: take oem_id in build_header(), optionally, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 39/49] acpi: expose oem_id and oem_table_id in build_rsdt(), Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 40/49] acpi: add function to extract oem_id and oem_table_id from the user's SLIC, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 41/49] pc: set the OEM fields in the RSDT and the FADT from the SLIC, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 42/49] dimm: Correct type of MemoryHotplugState->base, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 43/49] intel_iommu: large page support, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 44/49] fix MSI injection on Xen, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 45/49] net: set endianness on all backend devices, Michael S. Tsirkin, 2016/02/04