mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parallel: 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-11-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:45 +02:00 committed by Anthony Liguori
parent fe6f5deb66
commit b0dc5ee6bd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/char/parallel.c
View File

@ -80,8 +80,13 @@ typedef struct ParallelState {
int it_shift; int it_shift;
} ParallelState; } ParallelState;
#define TYPE_ISA_PARALLEL "isa-parallel"
#define ISA_PARALLEL(obj) \
OBJECT_CHECK(ISAParallelState, (obj), TYPE_ISA_PARALLEL)
typedef struct ISAParallelState { typedef struct ISAParallelState {
ISADevice dev; ISADevice parent_obj;
uint32_t index; uint32_t index;
uint32_t iobase; uint32_t iobase;
uint32_t isairq; uint32_t isairq;
@ -475,7 +480,7 @@ static const MemoryRegionPortio isa_parallel_portio_sw_list[] = {
static int parallel_isa_initfn(ISADevice *dev) static int parallel_isa_initfn(ISADevice *dev)
{ {
static int index; static int index;
ISAParallelState *isa = DO_UPCAST(ISAParallelState, dev, dev); ISAParallelState *isa = ISA_PARALLEL(dev);
ParallelState *s = &isa->state; ParallelState *s = &isa->state;
int base; int base;
uint8_t dummy; uint8_t dummy;
@ -600,7 +605,7 @@ static void parallel_isa_class_initfn(ObjectClass *klass, void *data)
} }
static const TypeInfo parallel_isa_info = { static const TypeInfo parallel_isa_info = {
.name = "isa-parallel", .name = TYPE_ISA_PARALLEL,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAParallelState), .instance_size = sizeof(ISAParallelState),
.class_init = parallel_isa_class_initfn, .class_init = parallel_isa_class_initfn,