From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3SIK-0006ON-IB for qemu-devel@nongnu.org; Wed, 26 Apr 2017 15:08:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3SIG-0006Ay-TO for qemu-devel@nongnu.org; Wed, 26 Apr 2017 15:08:08 -0400 From: Bruce Rogers Date: Wed, 26 Apr 2017 13:07:02 -0600 Message-Id: <1493233622-14485-1-git-send-email-brogers@suse.com> Subject: [Qemu-devel] [PATCH] ACPI: call acpi_set_pci_info when only acpi enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, sstabellini@kernel.org, mst@redhat.com, qemu-stable@nongnu.org, Bruce Rogers Commit f0c9d64a exposed an issue with the code order in acpi_setup. As of that commit, a xenfv machine type guest will no longer start if using pci passthrough. Re-order the code in that function to allow acpi_set_pci_info to be called before bailing on the other, non-related conditions. With this change I can again use pci passthrough and xenfv together. Signed-off-by: Bruce Rogers --- hw/i386/acpi-build.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2073108..1ec072f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2834,6 +2834,13 @@ void acpi_setup(void) AcpiBuildState *build_state; Object *vmgenid_dev; + if (!acpi_enabled) { + ACPI_BUILD_DPRINTF("ACPI disabled. Bailing out.\n"); + return; + } + + acpi_set_pci_info(); + if (!pcms->fw_cfg) { ACPI_BUILD_DPRINTF("No fw cfg. Bailing out.\n"); return; @@ -2844,15 +2851,8 @@ void acpi_setup(void) return; } - if (!acpi_enabled) { - ACPI_BUILD_DPRINTF("ACPI disabled. Bailing out.\n"); - return; - } - build_state = g_malloc0(sizeof *build_state); - acpi_set_pci_info(); - acpi_build_tables_init(&tables); acpi_build(&tables, MACHINE(pcms)); -- 1.9.0