diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2020-10-21 10:47:16 -0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-10-30 04:29:13 -0400 |
| commit | 0259c78ca79190df6e307a6ae43886dcb69eb92a (patch) | |
| tree | 2ff4cb9a9adb312e2e22402ad9779e78c89b7103 /softmmu | |
| parent | 170a6794efde98fb1ad70f59d4cd9af7decf279d (diff) | |
| download | qemu-0259c78ca79190df6e307a6ae43886dcb69eb92a.zip qemu-0259c78ca79190df6e307a6ae43886dcb69eb92a.tar.gz qemu-0259c78ca79190df6e307a6ae43886dcb69eb92a.tar.bz2 | |
pc: Implement -no-hpet as sugar for -machine hpet=on
Get rid of yet another global variable.
The default will be hpet=on only if CONFIG_HPET=y.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20201021144716.1536388-1-ehabkost@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 7c1c6d3..a537a03 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -146,7 +146,6 @@ static Chardev **serial_hds; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; int win2k_install_hack = 0; int singlestep = 0; -int no_hpet = 0; int fd_bootchk = 1; static int no_reboot; int no_shutdown = 0; @@ -3562,7 +3561,8 @@ void qemu_init(int argc, char **argv, char **envp) qemu_opts_parse_noisily(olist, "acpi=off", false); break; case QEMU_OPTION_no_hpet: - no_hpet = 1; + olist = qemu_find_opts("machine"); + qemu_opts_parse_noisily(olist, "hpet=off", false); break; case QEMU_OPTION_no_reboot: no_reboot = 1; |