mips_malta: QOM cast cleanup

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Andreas Färber 2013-07-27 22:19:54 +02:00 committed by Aurelien Jarno
parent 240ce26a05
commit cba5cb67be

View File

@ -79,8 +79,12 @@ typedef struct {
SerialState *uart; SerialState *uart;
} MaltaFPGAState; } MaltaFPGAState;
#define TYPE_MIPS_MALTA "mips-malta"
#define MIPS_MALTA(obj) OBJECT_CHECK(MaltaState, (obj), TYPE_MIPS_MALTA)
typedef struct { typedef struct {
SysBusDevice busdev; SysBusDevice parent_obj;
qemu_irq *i8259; qemu_irq *i8259;
} MaltaState; } MaltaState;
@ -808,8 +812,8 @@ void mips_malta_init(QEMUMachineInitArgs *args)
int fl_sectors = bios_size >> 16; int fl_sectors = bios_size >> 16;
int be; int be;
DeviceState *dev = qdev_create(NULL, "mips-malta"); DeviceState *dev = qdev_create(NULL, TYPE_MIPS_MALTA);
MaltaState *s = DO_UPCAST(MaltaState, busdev.qdev, dev); MaltaState *s = MIPS_MALTA(dev);
qdev_init_nofail(dev); qdev_init_nofail(dev);
@ -1004,7 +1008,7 @@ static void mips_malta_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo mips_malta_device = { static const TypeInfo mips_malta_device = {
.name = "mips-malta", .name = TYPE_MIPS_MALTA,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MaltaState), .instance_size = sizeof(MaltaState),
.class_init = mips_malta_class_init, .class_init = mips_malta_class_init,