ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ahci: QOM'ify some more 

Introduce type constant and avoid DO_UPCAST().

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
[AF: Renamed parent field]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Hu Tao 2013-07-01 18:18:30 +08:00 committed by Andreas Färber
parent 3509c396d2
commit b3b162c3cf
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/ide/ahci.c
View File

@ -1286,8 +1286,14 @@ const VMStateDescription vmstate_ahci = {
}, },
}; };
#define TYPE_SYSBUS_AHCI "sysbus-ahci"
#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI)
typedef struct SysbusAHCIState { typedef struct SysbusAHCIState {
SysBusDevice busdev; /*< private >*/
SysBusDevice parent_obj;
/*< public >*/
AHCIState ahci; AHCIState ahci;
uint32_t num_ports; uint32_t num_ports;
} SysbusAHCIState; } SysbusAHCIState;
@ -1303,15 +1309,15 @@ static const VMStateDescription vmstate_sysbus_ahci = {
static void sysbus_ahci_reset(DeviceState *dev) static void sysbus_ahci_reset(DeviceState *dev)
{ {
SysbusAHCIState *s = DO_UPCAST(SysbusAHCIState, busdev.qdev, dev); SysbusAHCIState *s = SYSBUS_AHCI(dev);
ahci_reset(&s->ahci); ahci_reset(&s->ahci);
} }
static int sysbus_ahci_init(SysBusDevice *dev) static int sysbus_ahci_init(SysBusDevice *dev)
{ {
SysbusAHCIState *s = FROM_SYSBUS(SysbusAHCIState, dev); SysbusAHCIState *s = SYSBUS_AHCI(dev);
ahci_init(&s->ahci, &dev->qdev, NULL, s->num_ports); ahci_init(&s->ahci, DEVICE(dev), NULL, s->num_ports);
sysbus_init_mmio(dev, &s->ahci.mem); sysbus_init_mmio(dev, &s->ahci.mem);
sysbus_init_irq(dev, &s->ahci.irq); sysbus_init_irq(dev, &s->ahci.irq);
@ -1335,7 +1341,7 @@ static void sysbus_ahci_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo sysbus_ahci_info = { static const TypeInfo sysbus_ahci_info = {
.name = "sysbus-ahci", .name = TYPE_SYSBUS_AHCI,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SysbusAHCIState), .instance_size = sizeof(SysbusAHCIState),
.class_init = sysbus_ahci_class_init, .class_init = sysbus_ahci_class_init,