[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/44] qdev: move DO_UPCAST() into osdep.h
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 10/44] qdev: move DO_UPCAST() into osdep.h |
Date: |
Wed, 25 Nov 2009 18:49:03 +0000 |
Nothing qdev specific about this, make it available throughtout.
Signed-off-by: Mark McLoughlin <address@hidden>
---
hw/qdev.h | 10 ----------
osdep.h | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/qdev.h b/hw/qdev.h
index 41642ee..8d53754 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -154,16 +154,6 @@ CharDriverState *qdev_init_chardev(DeviceState *dev);
BusState *qdev_get_parent_bus(DeviceState *dev);
-/* Convert from a base type to a parent type, with compile time checking. */
-#ifdef __GNUC__
-#define DO_UPCAST(type, field, dev) ( __extension__ ( { \
- char __attribute__((unused)) offset_must_be_zero[ \
- -offsetof(type, field)]; \
- container_of(dev, type, field);}))
-#else
-#define DO_UPCAST(type, field, dev) container_of(dev, type, field)
-#endif
-
/*** BUS API. ***/
void qbus_create_inplace(BusState *bus, BusInfo *info,
diff --git a/osdep.h b/osdep.h
index 4b4aad4..75b5816 100644
--- a/osdep.h
+++ b/osdep.h
@@ -37,6 +37,16 @@
(type *) ((char *) __mptr - offsetof(type, member));})
#endif
+/* Convert from a base type to a parent type, with compile time checking. */
+#ifdef __GNUC__
+#define DO_UPCAST(type, field, dev) ( __extension__ ( { \
+ char __attribute__((unused)) offset_must_be_zero[ \
+ -offsetof(type, field)]; \
+ container_of(dev, type, field);}))
+#else
+#define DO_UPCAST(type, field, dev) container_of(dev, type, field)
+#endif
+
#define typeof_field(type, field) typeof(((type *)0)->field)
#define type_check(t1,t2) ((t1*)0 - (t2*)0)
--
1.6.5.2
- [Qemu-devel] [PATCH 00/44] Fix announce_self(), misc net fixes and cleanups, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 03/44] net: move socket backend code from net.c to net/socket.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 01/44] net: move slirp code from net.c to net/slirp.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 02/44] net: move vde code from net.c to net/vde.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 04/44] net: move dump backend code from net.c to net/dump.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 09/44] net: introduce qemu_new_net_client(), Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 06/44] net: remove NICInfo::vc, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 10/44] qdev: move DO_UPCAST() into osdep.h,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 11/44] net: convert tap to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 28/44] net: convert mipsnet to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 17/44] net: introduce NICState and qemu_new_nic(), Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 34/44] net: move parse_macaddr() to net/util.[ch], Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 35/44] net: convert xen to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 22/44] net: convert pcnet to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 12/44] net: convert tap-win32 to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 21/44] net: convert ne2000 to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 07/44] net: remove NICInfo::private, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 05/44] net: clean up includes in net.c, Mark McLoughlin, 2009/11/25