[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 v2 18/20] vmmouse: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.5 v2 18/20] vmmouse: QOM'ify |
Date: |
Sat, 27 Apr 2013 22:18:53 +0200 |
Introduce type constant and cast macro to obsolete DO_UPCAST() and
container_of(). Prepares for ISA realizefn.
Remove reserved underscore from struct name while at it.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/input/vmmouse.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c
index f4f9c93..a610738 100644
--- a/hw/input/vmmouse.c
+++ b/hw/input/vmmouse.c
@@ -51,9 +51,13 @@
#define DPRINTF(fmt, ...) do { } while (0)
#endif
-typedef struct _VMMouseState
+#define TYPE_VMMOUSE "vmmouse"
+#define VMMOUSE(obj) OBJECT_CHECK(VMMouseState, (obj), TYPE_VMMOUSE)
+
+typedef struct VMMouseState
{
- ISADevice dev;
+ ISADevice parent_obj;
+
uint32_t queue[VMMOUSE_QUEUE_SIZE];
int32_t queue_size;
uint16_t nb_queue;
@@ -250,7 +254,7 @@ static const VMStateDescription vmstate_vmmouse = {
static void vmmouse_reset(DeviceState *d)
{
- VMMouseState *s = container_of(d, VMMouseState, dev.qdev);
+ VMMouseState *s = VMMOUSE(d);
s->queue_size = VMMOUSE_QUEUE_SIZE;
@@ -259,7 +263,7 @@ static void vmmouse_reset(DeviceState *d)
static int vmmouse_initfn(ISADevice *dev)
{
- VMMouseState *s = DO_UPCAST(VMMouseState, dev, dev);
+ VMMouseState *s = VMMOUSE(dev);
DPRINTF("vmmouse_init\n");
@@ -287,7 +291,7 @@ static void vmmouse_class_initfn(ObjectClass *klass, void
*data)
}
static const TypeInfo vmmouse_info = {
- .name = "vmmouse",
+ .name = TYPE_VMMOUSE,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(VMMouseState),
.class_init = vmmouse_class_initfn,
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.5 v2 08/20] mc146818rtc: QOM'ify, (continued)
- [Qemu-devel] [PATCH for-1.5 v2 08/20] mc146818rtc: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 09/20] ne2000-isa: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 11/20] pc: QOM'ify port 92, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 12/20] pckbd: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 13/20] pcspk: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 14/20] sb16: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 15/20] serial: QOM'ify ISA serial, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 16/20] sga: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 17/20] vga-isa: QOM'ify ISA VGA, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 18/20] vmmouse: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.5 v2 19/20] vmport: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 20/20] wdt_ib700: QOM'ify, Andreas Färber, 2013/04/27
- Re: [Qemu-devel] [PATCH for-1.5 v2 00/20] QOM realize for ISA, part 1, Anthony Liguori, 2013/04/29