From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRRqG-0008Tb-Dh for qemu-devel@nongnu.org; Thu, 04 Feb 2016 16:53:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRRqC-0005co-9u for qemu-devel@nongnu.org; Thu, 04 Feb 2016 16:53:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRRqC-0005ck-51 for qemu-devel@nongnu.org; Thu, 04 Feb 2016 16:53:28 -0500 Date: Thu, 4 Feb 2016 23:53:24 +0200 From: "Michael S. Tsirkin" Message-ID: <1454612376-7072-38-git-send-email-mst@redhat.com> References: <1454612376-7072-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454612376-7072-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 37/49] pc: Eliminate PcGuestInfo struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Eduardo Habkost , Paolo Bonzini From: Eduardo Habkost The struct is not used for anything, now. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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