From patchwork Mon Nov 26 00:12:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [RFC,10/34] i82374: QOM'ify Date: Sun, 25 Nov 2012 14:12:22 -0000 From: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 201612 Message-Id: <1353888766-6951-11-git-send-email-afaerber@suse.de> To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Introduce type constant and cast macro to obsolete DO_UPCAST(). Prepares for ISA realizefn. Signed-off-by: Andreas Färber --- 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,