[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RfC PATCH 2/2] qdev/prop: macros for creating typechecked
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [RfC PATCH 2/2] qdev/prop: macros for creating typechecked properties. |
Date: |
Tue, 28 Jul 2009 18:22:00 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pci.c | 5 +++++
hw/qdev-addr.h | 3 +++
hw/qdev.h | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 4d0cdc7..bac0f8b 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -60,6 +60,7 @@ static struct BusInfo pci_bus_info = {
.size = sizeof(PCIBus),
.print_dev = pcibus_dev_print,
.props = (Property[]) {
+#if 0
{
.name = "addr",
.info = &qdev_prop_pci_devfn,
@@ -67,6 +68,10 @@ static struct BusInfo pci_bus_info = {
.defval = (uint32_t[]) { -1 },
},
{/* end of list */}
+#else
+ DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
+ DEFINE_PROP_END_OF_LIST()
+#endif
}
};
diff --git a/hw/qdev-addr.h b/hw/qdev-addr.h
index f02bd7a..9568c27 100644
--- a/hw/qdev-addr.h
+++ b/hw/qdev-addr.h
@@ -1,2 +1,5 @@
+#define DEFINE_PROP_TADDR(_n, _s, _f) \
+ DEFINE_PROP(_n, _s, _f, qdev_prop_taddr, target_phys_addr_t)
+
extern PropertyInfo qdev_prop_taddr;
void qdev_prop_set_taddr(DeviceState *dev, const char *name,
target_phys_addr_t value);
diff --git a/hw/qdev.h b/hw/qdev.h
index af2ee0f..3a02af9 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -155,6 +155,46 @@ extern PropertyInfo qdev_prop_ptr;
extern PropertyInfo qdev_prop_macaddr;
extern PropertyInfo qdev_prop_pci_devfn;
+extern int type_check_failed;
+#define typeof_field(type, field) typeof(((type *)0)->field)
+#define type_check(t1,t2) __builtin_choose_expr( \
+ __builtin_types_compatible_p(t1,t2),0,type_check_failed)
+
+#define DEFINE_PROP(_name, _state, _field, _prop, _type) { \
+ .name = (_name), \
+ .info = &(_prop), \
+ .offset = offsetof(_state, _field) \
+ + type_check(_type,typeof_field(_state, _field)), \
+ }
+#define DEFINE_PROP_DEFAULT(_name, _state, _field, _defval, _prop, _type) { \
+ .name = (_name), \
+ .info = &(_prop), \
+ .offset = offsetof(_state, _field) \
+ + type_check(_type,typeof_field(_state, _field)), \
+ .defval = (_type[]) { _defval }, \
+ }
+
+#define DEFINE_PROP_UINT16(_n, _s, _f, _d) \
+ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint16, uint16_t)
+#define DEFINE_PROP_UINT32(_n, _s, _f, _d) \
+ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint32, uint32_t)
+#define DEFINE_PROP_UINT64(_n, _s, _f, _d) \
+ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint64, uint64_t)
+#define DEFINE_PROP_HEX32(_n, _s, _f, _d) \
+ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_hex32, uint32_t)
+#define DEFINE_PROP_HEX64(_n, _s, _f, _d) \
+ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_hex64, uint64_t)
+#define DEFINE_PROP_PCI_DEVFN(_n, _s, _f, _d) \
+ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_pci_devfn, uint32_t)
+
+#define DEFINE_PROP_PTR(_n, _s, _f) \
+ DEFINE_PROP(_n, _s, _f, qdev_prop_ptr, void*)
+#define DEFINE_PROP_MACADDR(_n, _s, _f) \
+ DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, uint8_t[6])
+
+#define DEFINE_PROP_END_OF_LIST() \
+ {}
+
/* Set properties between creation and init. */
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop);
int qdev_prop_parse(DeviceState *dev, const char *name, const char *value);
--
1.6.2.5