[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 27/28] hpet: fix build with CONFIG_HPET off
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 27/28] hpet: fix build with CONFIG_HPET off |
Date: |
Wed, 11 Dec 2013 20:31:39 +0200 |
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: address@hidden
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/timer/hpet.h | 10 +++++++++-
hw/timer/hpet.c | 6 ------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h
index ab44bd3..773953b 100644
--- a/include/hw/timer/hpet.h
+++ b/include/hw/timer/hpet.h
@@ -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
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 0ec440e..bb3bf98 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -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,
--
MST
- [Qemu-devel] [PULL 14/28] exec: make address spaces 64-bit wide, (continued)
- [Qemu-devel] [PULL 14/28] exec: make address spaces 64-bit wide, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 15/28] exec: reduce L2_PAGE_SIZE, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 16/28] smbios: Set system manufacturer, product & version by default, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 21/28] hpet: inverse polarity when pin above ISA_NUM_IRQS, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 23/28] memory.c: bugfix - ref counting mismatch in memory_region_find, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 24/28] exec: separate sections and nodes per address space, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 22/28] hpet: enable to entitle more irq pins for hpet, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 25/28] acpi unit-test: load and check facs table, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 26/28] acpi unit-test: adjust the test data structure for better handling, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 28/28] pc: use macro for HPET type, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 27/28] hpet: fix build with CONFIG_HPET off,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 17/28] acpi unit-test: verify signature and checksum, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 20/28] pci: fix pci bridge fw path, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 18/28] acpi: strip compiler info in built-in DSDT, Michael S. Tsirkin, 2013/12/11
- [Qemu-devel] [PULL 19/28] ACPI DSDT: Make control method `IQCR` serialized, Michael S. Tsirkin, 2013/12/11