From: Andreas Färber Date: Sat, 27 Apr 2013 20:18:45 +0000 (+0200) Subject: parallel: QOM'ify X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~516 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b0dc5ee6bd0b16986a0f45ca778f3ead2398b2ee;p=qemu-xen.git parallel: QOM'ify Introduce type constant and cast macro to obsolete DO_UPCAST(). Prepares for ISA realizefn. Signed-off-by: Andreas Färber Signed-off-by: Andreas Färber Message-id: 1367093935-29091-11-git-send-email-afaerber@suse.de Signed-off-by: Anthony Liguori --- diff --git a/hw/char/parallel.c b/hw/char/parallel.c index b5e867f21c..8e48284520 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -80,8 +80,13 @@ typedef struct ParallelState { int it_shift; } ParallelState; +#define TYPE_ISA_PARALLEL "isa-parallel" +#define ISA_PARALLEL(obj) \ + OBJECT_CHECK(ISAParallelState, (obj), TYPE_ISA_PARALLEL) + typedef struct ISAParallelState { - ISADevice dev; + ISADevice parent_obj; + uint32_t index; uint32_t iobase; uint32_t isairq; @@ -475,7 +480,7 @@ static const MemoryRegionPortio isa_parallel_portio_sw_list[] = { static int parallel_isa_initfn(ISADevice *dev) { static int index; - ISAParallelState *isa = DO_UPCAST(ISAParallelState, dev, dev); + ISAParallelState *isa = ISA_PARALLEL(dev); ParallelState *s = &isa->state; int base; uint8_t dummy; @@ -600,7 +605,7 @@ static void parallel_isa_class_initfn(ObjectClass *klass, void *data) } static const TypeInfo parallel_isa_info = { - .name = "isa-parallel", + .name = TYPE_ISA_PARALLEL, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(ISAParallelState), .class_init = parallel_isa_class_initfn,