From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhQJ-0005kc-LB for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQhQI-0000Rc-Un for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:27 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:34990) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQhQI-0000R7-NI for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:26 -0400 Received: by mail-lf0-x241.google.com with SMTP id n136so8680247lfn.2 for ; Thu, 29 Jun 2017 14:56:26 -0700 (PDT) From: Aleksandr Bezzubikov Date: Fri, 30 Jun 2017 00:56:00 +0300 Message-Id: <1498773362-18675-5-git-send-email-zuban32s@gmail.com> In-Reply-To: <1498773362-18675-1-git-send-email-zuban32s@gmail.com> References: <1498773362-18675-1-git-send-email-zuban32s@gmail.com> Subject: [Qemu-devel] [PATCH RFC 4/6] hw/acpi: prepare pci hotplug IO for ich9 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, mst@redhat.com, imammedo@redhat.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, Aleksandr Bezzubikov Signed-off-by: Aleksandr Bezzubikov --- hw/i386/acpi-build.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index c99dbcc..e434efe 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -135,12 +135,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) if (piix) { obj = piix; pm->cpu_hp_io_base = PIIX4_CPU_HOTPLUG_IO_BASE; - pcihp_io_base = - object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL); - pcihp_io_len = - object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, NULL); - pm->pcihp_io_base = (pcihp_io_base == -1) ? 0 : pcihp_io_base; - pm->pcihp_io_len = (pcihp_io_len == -1) ? 0 : pcihp_io_len; } if (lpc) { obj = lpc; @@ -148,6 +142,13 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) } assert(obj); + pcihp_io_base = + object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL); + pcihp_io_len = + object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, NULL); + pm->pcihp_io_base = (pcihp_io_base == -1) ? 0 : pcihp_io_base; + pm->pcihp_io_len = (pcihp_io_len == -1) ? 0 : pcihp_io_len; + /* Fill in optional s3/s4 related properties */ o = object_property_get_qobject(obj, ACPI_PM_PROP_S3_DISABLED, NULL); if (o) { -- 2.7.4