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 /softmmu | |
| 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 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index 814537bb42..a331fb5321 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -144,7 +144,6 @@ static Chardev **serial_hds; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; int win2k_install_hack = 0; int singlestep = 0; -int acpi_enabled = 1; int no_hpet = 0; int fd_bootchk = 1; static int no_reboot; @@ -3516,7 +3515,8 @@ void qemu_init(int argc, char **argv, char **envp) vnc_parse(optarg, &error_fatal); break; case QEMU_OPTION_no_acpi: - acpi_enabled = 0; + olist = qemu_find_opts("machine"); + qemu_opts_parse_noisily(olist, "acpi=off", false); break; case QEMU_OPTION_no_hpet: no_hpet = 1; |