From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdhC6-0004tO-6s for qemu-devel@nongnu.org; Tue, 05 Nov 2013 09:01:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdhC0-0000nd-7A for qemu-devel@nongnu.org; Tue, 05 Nov 2013 09:01:22 -0500 Received: from cantor2.suse.de ([195.135.220.15]:51016 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdhC0-0000nL-0m for qemu-devel@nongnu.org; Tue, 05 Nov 2013 09:01:16 -0500 Message-ID: <5278FA27.2070107@suse.de> Date: Tue, 05 Nov 2013 15:01:11 +0100 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <20131104104611.GA11657@redhat.com> In-Reply-To: <20131104104611.GA11657@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [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: "Michael S. Tsirkin" Cc: Paolo Bonzini , qemu-devel@nongnu.org, Anthony Liguori , Eduardo Habkost Am 04.11.2013 11:46, schrieb Michael S. Tsirkin: > Disable acpi build for isapc and no_kvmclock machine > types (used by xen), since acpi build currently expects pci. >=20 > Reported-by: Andreas F=E4rber > Signed-off-by: Michael S. Tsirkin > --- > hw/i386/pc_piix.c | 2 ++ > 1 file changed, 2 insertions(+) >=20 > 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 *ar= gs) > 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(QEMUMachineInit= Args *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"; > } FWIW I forgot to reply yesterday that it solves my isapc qom-test failure, too Tested-by: Andreas F=E4rber Thanks! Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg