diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-11-04 12:42:46 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-11-04 15:38:44 +0200 |
| commit | 98af2ac93fa6bd83e19f7cff1cc9513fa7c4d58d (patch) | |
| tree | c4f834d5c8f1ef4eb0feee93c9f2b5221203a1de /hw/i386 | |
| parent | a126050a103c924b03388a9a64ce9af8c96b0969 (diff) | |
| download | qemu-98af2ac93fa6bd83e19f7cff1cc9513fa7c4d58d.tar.gz | |
pc: disable acpi info for isapc and old pc machine
Disable acpi build for isapc and no_kvmclock machine
types (used by xen), since acpi build currently expects pci.
Reported-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc_piix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 24a98cbee7..4fdb7b62c5 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"; } |