motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

i8259: QOM cleanups

Browse source 
Eliminate DO_UPCAST() for PICCommonState. Prepares for ISA realizefn.

Also give the i8259_common type registration functions unique names
while at it.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1367093935-29091-6-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:40 +02:00 • committed by Anthony Liguori
parent eb1440e7ec
commit 29bb5317cb
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/intc/i8259_common.c
View file

@ -68,7 +68,7 @@ static int pic_dispatch_post_load(void *opaque, int version_id)
static int pic_init_common(ISADevice *dev)
{
PICCommonState *s = DO_UPCAST(PICCommonState, dev, dev);
PICCommonState *s = PIC_COMMON(dev);
PICCommonClass *info = PIC_COMMON_GET_CLASS(s);
info->init(s);
@ -78,7 +78,7 @@ static int pic_init_common(ISADevice *dev)
isa_register_ioport(NULL, &s->elcr_io, s->elcr_addr);
}
qdev_set_legacy_instance_id(&s->dev.qdev, s->iobase, 1);
qdev_set_legacy_instance_id(DEVICE(dev), s->iobase, 1);
return 0;
}
@ -153,9 +153,9 @@ static const TypeInfo pic_common_type = {
.abstract = true,
};
static void register_types(void)
static void pic_common_register_types(void)
{
type_register_static(&pic_common_type);
}
type_init(register_types);
type_init(pic_common_register_types)