diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-12-11 16:42:33 -0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-02-06 20:44:10 +0200 |
| commit | e4e8ba04c2007d3d05d8a29857f95ae80951f5a3 (patch) | |
| tree | 2635dc781a3b9cc9696dbe8877f9a238e2877cbb | |
| parent | dd4c2f01ab92ae0a158958a8fc61fcd09e34987a (diff) | |
pc: Eliminate PcGuestInfo struct
The struct is not used for anything, now.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/i386/pc.c | 4 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 66f7bb9bc0..ce185bbee9 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 */ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 0cf67ed6f3..8b3546ed5c 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" |