From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7nmn-00021w-9G for qemu-devel@nongnu.org; Tue, 31 May 2016 13:49:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7nmg-0005uW-1g for qemu-devel@nongnu.org; Tue, 31 May 2016 13:49:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7nmf-0005uN-Sc for qemu-devel@nongnu.org; Tue, 31 May 2016 13:48:53 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7295364099 for ; Tue, 31 May 2016 17:48:53 +0000 (UTC) From: Marcel Apfelbaum Date: Tue, 31 May 2016 20:48:36 +0300 Message-Id: <1464716918-29689-6-git-send-email-marcel@redhat.com> In-Reply-To: <1464716918-29689-1-git-send-email-marcel@redhat.com> References: <1464716918-29689-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH RFC 5/7] 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, ehabkost@redhat.com Does not have any effect yet since the pcihp is not enabled for ICH9. Signed-off-by: Marcel Apfelbaum --- hw/i386/acpi-build.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2097c4c..8ae3e53 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -130,13 +130,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; @@ -144,6 +137,11 @@ 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; pm->cpu_hp_io_len = ACPI_GPE_PROC_LEN; pm->mem_hp_io_base = ACPI_MEMORY_HOTPLUG_BASE; pm->mem_hp_io_len = ACPI_MEMORY_HOTPLUG_IO_LEN; -- 2.4.3