From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48477)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VdJCr-0000wc-TO
	for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:24:39 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VdJCm-0000yf-CH
	for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:24:33 -0500
Received: from mail-qa0-x233.google.com ([2607:f8b0:400d:c00::233]:33469)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VdJCm-0000yb-7t
	for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:24:28 -0500
Received: by mail-qa0-f51.google.com with SMTP id hu16so23077qab.10
	for <qemu-devel@nongnu.org>; Mon, 04 Nov 2013 04:24:27 -0800 (PST)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <527791F4.9040303@redhat.com>
Date: Mon, 04 Nov 2013 13:24:20 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
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: 8bit
Subject: Re: [Qemu-devel] [PATCH] pc: disable acpi info for isapc and old pc
	machine
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: qemu-devel@nongnu.org, =?ISO-8859-1?Q?Andreas_F=E4rber?= <afaerber@suse.de>, Anthony Liguori <aliguori@amazon.com>, Eduardo Habkost <ehabkost@redhat.com>

Il 04/11/2013 11:46, Michael S. Tsirkin ha scritto:
> Disable acpi build for isapc and no_kvmclock machine
> types (used by xen), since acpi build currently expects pci.

Xen is now using "-M pc", so it's okay to remove it from the legacy "-M
xenfv".

> Reported-by: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  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 = false;
> +    has_acpi_build = 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(QEMUMachineInitArgs *args)
>  static void pc_init_isa(QEMUMachineInitArgs *args)
>  {
>      has_pci_info = false;
> +    has_acpi_build = false;
>      if (!args->cpu_model) {
>          args->cpu_model = "486";
>      }
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>