From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdHcz-0008Ou-FU for qemu-devel@nongnu.org; Mon, 04 Nov 2013 05:43:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdHcu-0000BQ-Ks for qemu-devel@nongnu.org; Mon, 04 Nov 2013 05:43:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdHcu-0000BL-CL for qemu-devel@nongnu.org; Mon, 04 Nov 2013 05:43:20 -0500 Date: Mon, 4 Nov 2013 12:46:11 +0200 From: "Michael S. Tsirkin" Message-ID: <20131104104611.GA11657@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] pc: disable acpi info for isapc and old pc machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?iso-8859-1?Q?F=E4rber?= Cc: Paolo Bonzini , Eduardo Habkost , qemu-devel@nongnu.org, Anthony Liguori Disable acpi build for isapc and no_kvmclock machine types (used by xen), since acpi build currently expects pci. Reported-by: Andreas F=E4rber Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 24a98cb..4fdb7b6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -309,6 +309,7 @@ static void pc_init_pci_1_2(QEMUMachineInitArgs *args= ) static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) { has_pci_info =3D false; + has_acpi_build =3D false; disable_kvm_pv_eoi(); enable_compat_apic_id_mode(); pc_init1(args, 1, 0); @@ -317,6 +318,7 @@ static void pc_init_pci_no_kvmclock(QEMUMachineInitAr= gs *args) static void pc_init_isa(QEMUMachineInitArgs *args) { has_pci_info =3D false; + has_acpi_build =3D false; if (!args->cpu_model) { args->cpu_model =3D "486"; } --=20 MST