[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 v2 04/20] i82374: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.5 v2 04/20] i82374: QOM'ify |
Date: |
Sat, 27 Apr 2013 22:18:39 +0200 |
Introduce type constant and cast macro to obsolete DO_UPCAST().
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/dma/i82374.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index 835639d..f3d1924 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -104,8 +104,12 @@ static void i82374_init(I82374State *s)
memset(s->commands, 0, sizeof(s->commands));
}
+#define TYPE_I82374 "i82374"
+#define I82374(obj) OBJECT_CHECK(ISAi82374State, (obj), TYPE_I82374)
+
typedef struct ISAi82374State {
- ISADevice dev;
+ ISADevice parent_obj;
+
uint32_t iobase;
I82374State state;
} ISAi82374State;
@@ -122,7 +126,7 @@ static const VMStateDescription vmstate_isa_i82374 = {
static int i82374_isa_init(ISADevice *dev)
{
- ISAi82374State *isa = DO_UPCAST(ISAi82374State, dev, dev);
+ ISAi82374State *isa = I82374(dev);
I82374State *s = &isa->state;
register_ioport_read(isa->iobase + 0x0A, 1, 1, i82374_read_isr, s);
@@ -154,7 +158,7 @@ static void i82374_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo i82374_isa_info = {
- .name = "i82374",
+ .name = TYPE_I82374,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAi82374State),
.class_init = i82374_class_init,
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.5 v2 00/20] QOM realize for ISA, part 1, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 02/20] cirrus_vga: QOM'ify ISA Cirrus VGA, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 01/20] applesmc: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 04/20] i82374: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.5 v2 03/20] fdc: QOM'ify ISA floppy controller, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 07/20] m48t59: QOM'ify ISA M48T59 NVRAM, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 06/20] ide: QOM'ify ISA IDE, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 05/20] i8259: QOM cleanups, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 10/20] parallel: QOM'ify, Andreas Färber, 2013/04/27
- [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