diff options
| author | Eduardo Habkost | 2020-10-21 16:47:16 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2020-10-30 09:29:13 +0100 |
| commit | 0259c78ca79190df6e307a6ae43886dcb69eb92a (patch) | |
| tree | 2ff4cb9a9adb312e2e22402ad9779e78c89b7103 /include/hw/i386 | |
| parent | vhost: Don't special case vq->used_phys in vhost_get_log_size() (diff) | |
| download | qemu-0259c78ca79190df6e307a6ae43886dcb69eb92a.tar.gz qemu-0259c78ca79190df6e307a6ae43886dcb69eb92a.tar.xz qemu-0259c78ca79190df6e307a6ae43886dcb69eb92a.zip | |
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 'include/hw/i386')
| -rw-r--r-- | include/hw/i386/pc.h | 1 | ||||
| -rw-r--r-- | include/hw/i386/x86.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 84639d0ebc..911e460097 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -43,6 +43,7 @@ typedef struct PCMachineState { bool smbus_enabled; bool sata_enabled; bool pit_enabled; + bool hpet_enabled; /* NUMA information: */ uint64_t numa_nodes; diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index bfa9cb2a25..739fac5087 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -126,7 +126,4 @@ qemu_irq x86_allocate_cpu_irq(void); void gsi_handler(void *opaque, int n, int level); void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name); -/* hpet.c */ -extern int no_hpet; - #endif |