On 12/11/2015 08:42 PM, Eduardo Habkost wrote:
The struct is not used for anything, now.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
hw/i386/pc.c | 4 +---
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 43a25a0..f78b877 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1182,9 +1182,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)
We don't have a PCGuestInfo anymore :) so maybe we can change the function name
to something more meaningful (it does not init the PCGuestInfo anymore...).
Not that I have an idea for the name.
Thanks for the patches!
I hope I helped,
Marcel
{
- PcGuestInfo *guest_info = &pcms->acpi_guest_info;
int i, j;
pcms->apic_id_limit = pc_apic_id_limit(max_cpus);
@@ -1212,7 +1211,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 4b7f8f9..7243774 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -20,10 +20,6 @@
#define HPET_INTCAP "hpet-intcap"
-/* Machine info for ACPI build: */
-struct PcGuestInfo {
-};
-
/**
* PCMachineState:
* @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling
@@ -36,7 +32,6 @@ struct PCMachineState {
/* State for other subsystems/APIs: */
MemoryHotplugState hotplug_memory;
- PcGuestInfo acpi_guest_info;
Notifier machine_done;
/* Pointers to devices and objects: */
@@ -215,7 +210,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"
