hpet: fix build with CONFIG_HPET off
PATCH 1/2 hpet: fix build with CONFIG_HPET off
make hpet_find inline so we don't need
to build hpet.c to check if hpet is enabled.
Fixes link error with CONFIG_HPET off.
Signed-off-by Michael S. Tsirkin <[email protected]>
--- include/hw/timer/hpet.h | 10 +++++++++- hw/timer/hpet.c | 6 ------ 2 files changed, 9 insertions(+), 7 deletions(-)
include/hw/timer/hpet.h +9 -1
@@ -13,6 +13,8 @@#ifndef QEMU_HPET_EMUL_H #define QEMU_HPET_EMUL_H +#include "qom/object.h" +#define HPET_BASE 0xfed00000#define HPET_CLK_PERIOD 10000000ULL/* 10000000 femtoseconds == 10ns*/
@@ -72,5 +74,11 @@ struct hpet_fw_configextern struct hpet_fw_config hpet_cfg; -bool hpet_find (void ); +#define TYPE_HPET "hpet" + +static inline bool hpet_find (void ) +{ +return object_resolve_path_type ("" ,TYPE_HPET ,NULL ); +} +#endif
hw/timer/hpet.c +0 -6
@@ -42,7 +42,6 @@#define HPET_MSI_SUPPORT 0 -#define TYPE_HPET "hpet"#define HPET (obj) OBJECT_CHECK(HPETState, (obj), TYPE_HPET)struct HPETState ;
@@ -772,11 +771,6 @@ static void hpet_device_class_init(ObjectClass *klass, void *data) dc->props = hpet_device_properties; } -bool hpet_find (void ) -{ -return object_resolve_path_type ("" ,TYPE_HPET ,NULL ); -} -static const TypeInfo hpet_device_info = { .name =TYPE_HPET , .parent =TYPE_SYS_BUS_DEVICE ,
Signature · 1 line
MST
PATCH 2/2 pc: use macro for HPET type
avoid hard-coding strings
Signed-off-by Michael S. Tsirkin <[email protected]>
--- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/pc.c +1 -1
@@ -1331,7 +1331,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,*/ if (!no_hpet && (!kvm_irqchip_in_kernel () ||kvm_has_pit_state2 ())) {/* In order to set property, here not using sysbus_try_create_simple */ - hpet =qdev_try_create (NULL ,"hpet" ); + hpet =qdev_try_create (NULL ,TYPE_HPET );if (hpet) {/* For pc-piix-*, hpet's intcap is always IRQ2. For pc-q35-1.7 * and earlier, use IRQ2 for compat. Otherwise, use IRQ16~23,
Signature · 1 line
MST