[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] Move hpet_find function from hpet.c to pc.c
From: |
mrezanin |
Subject: |
[Qemu-devel] [PATCH] Move hpet_find function from hpet.c to pc.c |
Date: |
Wed, 11 Dec 2013 12:59:37 +0100 |
From: Miroslav Rezanina <address@hidden>
Function hpet_find could not be used for checking hpet availability becouse
it was not build when hpet was disabled.
To allow proper use of this function, moving it from hw/timer/hpet.c to
hw/i386/pc.c.
Signed-off-by: Miroslav Rezanina <address@hidden>
---
hw/i386/pc.c | 5 +++++
hw/timer/hpet.c | 5 -----
include/hw/i386/pc.h | 2 ++
include/hw/timer/hpet.h | 1 -
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 12c436e..7fd08dd 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1403,3 +1403,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char
*parent_name)
gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
}
}
+
+bool hpet_find(void)
+{
+ return object_resolve_path_type("", "hpet", NULL);
+}
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 2eb75ea..fcd22ae 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -757,11 +757,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,
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 09652fb..f81b615 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -178,6 +178,8 @@ void piix4_smbus_register_device(SMBusDevice *dev, uint8_t
addr);
/* hpet.c */
extern int no_hpet;
+bool hpet_find(void);
+
/* piix_pci.c */
struct PCII440FXState;
typedef struct PCII440FXState PCII440FXState;
diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h
index ab44bd3..3fae8ad 100644
--- a/include/hw/timer/hpet.h
+++ b/include/hw/timer/hpet.h
@@ -72,5 +72,4 @@ struct hpet_fw_config
extern struct hpet_fw_config hpet_cfg;
-bool hpet_find(void);
#endif
--
1.8.3.1
- [Qemu-devel] [PATCH] Move hpet_find function from hpet.c to pc.c,
mrezanin <=