david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i82374: QOM'ify

Browse Source 
Introduce type constant and cast macro to obsolete DO_UPCAST().

Prepares for ISA realizefn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1367093935-29091-5-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber 2013-04-27 22:18:39 +02:00 committed by Anthony Liguori
parent 020c8e7602
commit eb1440e7ec
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/dma/i82374.c
View File

@ -104,8 +104,12 @@ static void i82374_init(I82374State *s)
memset(s->commands, 0, sizeof(s->commands)); memset(s->commands, 0, sizeof(s->commands));
} }
#define TYPE_I82374 "i82374"
#define I82374(obj) OBJECT_CHECK(ISAi82374State, (obj), TYPE_I82374)
typedef struct ISAi82374State { typedef struct ISAi82374State {
ISADevice dev; ISADevice parent_obj;
uint32_t iobase; uint32_t iobase;
I82374State state; I82374State state;
} ISAi82374State; } ISAi82374State;
@ -122,7 +126,7 @@ static const VMStateDescription vmstate_isa_i82374 = {
static int i82374_isa_init(ISADevice *dev) static int i82374_isa_init(ISADevice *dev)
{ {
ISAi82374State *isa = DO_UPCAST(ISAi82374State, dev, dev); ISAi82374State *isa = I82374(dev);
I82374State *s = &isa->state; I82374State *s = &isa->state;
register_ioport_read(isa->iobase + 0x0A, 1, 1, i82374_read_isr, s); 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 = { static const TypeInfo i82374_isa_info = {
.name = "i82374", .name = TYPE_I82374,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAi82374State), .instance_size = sizeof(ISAi82374State),
.class_init = i82374_class_init, .class_init = i82374_class_init,