diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-04-27 22:18:38 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-29 08:27:47 -0500 |
| commit | 020c8e7602fc6bf6a6ce62d99fb0a0882877ccd1 (patch) | |
| tree | 3afd2d9873d244e791b5d614f77a7f76dfc33c69 /hw | |
| parent | 6d4c2f175510a447f1aa6641e1a2337958a7c6af (diff) | |
fdc: QOM'ify ISA floppy controller
Introduce type constant and cast macro to obsolete DO_UPCAST().
Reuse type constant for PC machine compatibility settings.
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-4-git-send-email-afaerber@suse.de
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/fdc.c | 21 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/hw/block/fdc.c b/hw/block/fdc.c index f1f1fd7f3b..0888652fe8 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -549,8 +549,11 @@ typedef struct FDCtrlSysBus { struct FDCtrl state; } FDCtrlSysBus; +#define ISA_FDC(obj) OBJECT_CHECK(FDCtrlISABus, (obj), TYPE_ISA_FDC) + typedef struct FDCtrlISABus { - ISADevice busdev; + ISADevice parent_obj; + uint32_t iobase; uint32_t irq; uint32_t dma; @@ -778,7 +781,7 @@ static void fdctrl_external_reset_sysbus(DeviceState *d) static void fdctrl_external_reset_isa(DeviceState *d) { - FDCtrlISABus *isa = container_of(d, FDCtrlISABus, busdev.qdev); + FDCtrlISABus *isa = ISA_FDC(d); FDCtrl *s = &isa->state; fdctrl_reset(s, 0); @@ -2021,7 +2024,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds) { ISADevice *dev; - dev = isa_try_create(bus, "isa-fdc"); + dev = isa_try_create(bus, TYPE_ISA_FDC); if (!dev) { return NULL; } @@ -2116,13 +2119,13 @@ static const MemoryRegionPortio fdc_portio_list[] = { static int isabus_fdc_init1(ISADevice *dev) { - FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev); + FDCtrlISABus *isa = ISA_FDC(dev); FDCtrl *fdctrl = &isa->state; int ret; isa_register_portio_list(dev, isa->iobase, fdc_portio_list, fdctrl, "fdc"); - isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); + isa_init_irq(dev, &fdctrl->irq, isa->irq); fdctrl->dma_chann = isa->dma; qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); @@ -2169,7 +2172,7 @@ static int sun4m_fdc_init1(SysBusDevice *dev) FDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i) { - FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, fdc); + FDCtrlISABus *isa = ISA_FDC(fdc); return isa->state.drives[i].drive; } @@ -2197,7 +2200,7 @@ static Property isa_fdc_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static void isabus_fdc_class_init1(ObjectClass *klass, void *data) +static void isabus_fdc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); @@ -2210,10 +2213,10 @@ static void isabus_fdc_class_init1(ObjectClass *klass, void *data) } static const TypeInfo isa_fdc_info = { - .name = "isa-fdc", + .name = TYPE_ISA_FDC, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(FDCtrlISABus), - .class_init = isabus_fdc_class_init1, + .class_init = isabus_fdc_class_init, }; static const VMStateDescription vmstate_sysbus_fdc ={ diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 89b4cb4635..08dd61d1d8 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -458,7 +458,7 @@ static QEMUMachine pc_machine_v1_1 = { .property = "rom_only",\ .value = stringify(1),\ }, {\ - .driver = "isa-fdc",\ + .driver = TYPE_ISA_FDC,\ .property = "check_media_rate",\ .value = "off",\ }, {\ |