From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7Sf4-0000Dl-4V for qemu-devel@nongnu.org; Fri, 11 Dec 2015 13:43:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a7Sf0-0001Ki-Ue for qemu-devel@nongnu.org; Fri, 11 Dec 2015 13:43:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7Sf0-0001Kd-Q7 for qemu-devel@nongnu.org; Fri, 11 Dec 2015 13:43:18 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 7010BC076630 for ; Fri, 11 Dec 2015 18:43:18 +0000 (UTC) From: Eduardo Habkost Date: Fri, 11 Dec 2015 16:42:33 -0200 Message-Id: <1449859353-1574-15-git-send-email-ehabkost@redhat.com> In-Reply-To: <1449859353-1574-1-git-send-email-ehabkost@redhat.com> References: <1449859353-1574-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 14/14] pc: Eliminate PcGuestInfo struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Marcel Apfelbaum , "Michael S. Tsirkin" The struct is not used for anything, now. Signed-off-by: Eduardo Habkost --- 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) { - 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" -- 2.1.0