[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 10/34] i82374: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC 10/34] i82374: QOM'ify |
Date: |
Mon, 26 Nov 2012 01:12:22 +0100 |
Introduce type constant and cast macro to obsolete DO_UPCAST().
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/i82374.c | 12 ++++++++----
1 Datei geändert, 8 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/hw/i82374.c b/hw/i82374.c
index 4a922c3..82de0b0 100644
--- a/hw/i82374.c
+++ b/hw/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);
@@ -153,8 +157,8 @@ static void i82374_class_init(ObjectClass *klass, void
*data)
dc->props = i82374_properties;
}
-static TypeInfo i82374_isa_info = {
- .name = "i82374",
+static const TypeInfo i82374_isa_info = {
+ .name = TYPE_I82374,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAi82374State),
.class_init = i82374_class_init,
--
1.7.10.4
- [Qemu-devel] [RFC 05/34] isa: Split off instance_init for ISADevice, (continued)
- [Qemu-devel] [RFC 05/34] isa: Split off instance_init for ISADevice, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 15/34] mc146818rtc: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 12/34] i8259: QOM cleanups, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 06/34] applesmc: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 07/34] cirrus_vga: QOM'ify ISA Cirrus VGA, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 18/34] pc: QOM'ify port 92, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 23/34] sga: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 17/34] parallel: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 21/34] sb16: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 22/34] serial: QOM'ify ISA serial, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 10/34] i82374: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [RFC 08/34] debugcon: QOM'ify ISA debug console, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 14/34] m48t59: QOM'ify ISA M48T59 NVRAM, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 02/34] qbus: QOM'ify qbus_realize(), Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 29/34] i8254: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 09/34] fdc: QOM'ify ISA floppy controller, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 13/34] ide: QOM'ify ISA IDE, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 24/34] vga-isa: QOM'ify ISA VGA, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 32/34] i8259: QOM'ify some more, Andreas Färber, 2012/11/25
- [Qemu-devel] [PATCH 01/34] qdev: Eliminate qdev_free() in favor of QOM, Andreas Färber, 2012/11/25