diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-03-20 11:01:36 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-03-29 09:52:13 -0400 |
| commit | 17e89077b7e3bc1d96540e21ddc7451c3e077049 (patch) | |
| tree | 47310cda860c2d8308496883b98b7beba9847160 /hw/i386/pc_piix.c | |
| parent | 9d283f85d755285bf1b1bfcb1ab275239dbf2c7b (diff) | |
acpi: add acpi=OnOffAuto machine property to x86 and arm virt
Remove the global acpi_enabled bool and replace it with an
acpi OnOffAuto machine property.
qemu throws an error now if you use -no-acpi while the machine
type you are using doesn't support acpi in the first place.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20200320100136.11717-1-kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index e6756216f9..9cceae3e2c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -275,7 +275,7 @@ static void pc_init1(MachineState *machine, pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci"); } - if (pcmc->pci_enabled && acpi_enabled) { + if (pcmc->pci_enabled && x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) { DeviceState *piix4_pm; smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); |