From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Uck-0004pG-Iy for qemu-devel@nongnu.org; Thu, 03 Dec 2015 09:12:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4Uci-0007Pn-NC for qemu-devel@nongnu.org; Thu, 03 Dec 2015 09:12:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Uci-0007PS-Ic for qemu-devel@nongnu.org; Thu, 03 Dec 2015 09:12:40 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 254E5C0CC651 for ; Thu, 3 Dec 2015 14:12:40 +0000 (UTC) From: Eduardo Habkost Date: Wed, 2 Dec 2015 20:22:55 -0200 Message-Id: <1449094978-22986-11-git-send-email-ehabkost@redhat.com> In-Reply-To: <1449094978-22986-1-git-send-email-ehabkost@redhat.com> References: <1449094978-22986-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 10/13] acpi: Change acpi_pci_hotplug_enabled() argument to PCMachineState 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" Now that we just use PCMachineState::acpi_dev, we can change the argument to acpi_pci_hotplug_enabled(). Signed-off-by: Eduardo Habkost --- hw/i386/acpi-build.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 440d4e2..585100f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -141,9 +141,10 @@ static void acpi_get_cpu_info(AcpiCpuInfo *cpu) object_child_foreach(root, acpi_add_cpu_info, cpu); } -static bool acpi_pci_hotplug_enabled(Object *acpi_dev) +static bool acpi_pci_hotplug_enabled(PCMachineState *pcms) { - return object_property_find(acpi_dev, ACPI_PCIHP_IO_BASE_PROP, NULL); + return object_property_find(OBJECT(pcms->acpi_dev), + ACPI_PCIHP_IO_BASE_PROP, NULL); } static void acpi_get_pm_info(AcpiPmInfo *pm, PCMachineState *pcms) @@ -154,7 +155,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm, PCMachineState *pcms) pm->pcihp_io_base = 0; pm->pcihp_io_len = 0; - if (acpi_pci_hotplug_enabled(obj)) { + if (acpi_pci_hotplug_enabled(pcms)) { pm->pcihp_io_base = object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, &error_abort); -- 2.1.0