On Mon, 4 Nov 2013, Paolo Bonzini wrote:
> 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".
that is correct
> > Reported-by: Andreas Färber <afaer...@suse.de>
> > Signed-off-by: Michael S. Tsirkin <m...@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 <pbonz...@redhat.com>
>
