Commit 142e0950 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

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.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8ac2adf7

hw/timer/hpet.c

+0 −6
Original line number Diff line number Diff line
@@ -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,

include/hw/timer/hpet.h

+9 −1
Original line number Diff line number Diff line
@@ -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_config 


extern 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