[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 v2 06/20] ide: QOM'ify ISA IDE
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.5 v2 06/20] ide: QOM'ify ISA IDE |
Date: |
Sat, 27 Apr 2013 22:18:41 +0200 |
Introduce type constant and cast macro to obsolete DO_UPCAST().
Add missing braces.
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ide/isa.c | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index e0d47bf..5e7422f 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -33,8 +33,12 @@
/***********************************************************/
/* ISA IDE definitions */
+#define TYPE_ISA_IDE "isa-ide"
+#define ISA_IDE(obj) OBJECT_CHECK(ISAIDEState, (obj), TYPE_ISA_IDE)
+
typedef struct ISAIDEState {
- ISADevice dev;
+ ISADevice parent_obj;
+
IDEBus bus;
uint32_t iobase;
uint32_t iobase2;
@@ -44,7 +48,7 @@ typedef struct ISAIDEState {
static void isa_ide_reset(DeviceState *d)
{
- ISAIDEState *s = container_of(d, ISAIDEState, dev.qdev);
+ ISAIDEState *s = ISA_IDE(d);
ide_bus_reset(&s->bus);
}
@@ -63,9 +67,9 @@ static const VMStateDescription vmstate_ide_isa = {
static int isa_ide_initfn(ISADevice *dev)
{
- ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev);
+ ISAIDEState *s = ISA_IDE(dev);
- ide_bus_new(&s->bus, &s->dev.qdev, 0);
+ ide_bus_new(&s->bus, DEVICE(dev), 0);
ide_init_ioport(&s->bus, dev, s->iobase, s->iobase2);
isa_init_irq(dev, &s->irq, s->isairq);
ide_init2(&s->bus, s->irq);
@@ -76,22 +80,27 @@ static int isa_ide_initfn(ISADevice *dev)
ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
DriveInfo *hd0, DriveInfo *hd1)
{
- ISADevice *dev;
+ DeviceState *dev;
+ ISADevice *isadev;
ISAIDEState *s;
- dev = isa_create(bus, "isa-ide");
- qdev_prop_set_uint32(&dev->qdev, "iobase", iobase);
- qdev_prop_set_uint32(&dev->qdev, "iobase2", iobase2);
- qdev_prop_set_uint32(&dev->qdev, "irq", isairq);
- if (qdev_init(&dev->qdev) < 0)
+ isadev = isa_create(bus, TYPE_ISA_IDE);
+ dev = DEVICE(isadev);
+ qdev_prop_set_uint32(dev, "iobase", iobase);
+ qdev_prop_set_uint32(dev, "iobase2", iobase2);
+ qdev_prop_set_uint32(dev, "irq", isairq);
+ if (qdev_init(dev) < 0) {
return NULL;
+ }
- s = DO_UPCAST(ISAIDEState, dev, dev);
- if (hd0)
+ s = ISA_IDE(dev);
+ if (hd0) {
ide_create_drive(&s->bus, 0, hd0);
- if (hd1)
+ }
+ if (hd1) {
ide_create_drive(&s->bus, 1, hd1);
- return dev;
+ }
+ return isadev;
}
static Property isa_ide_properties[] = {
@@ -112,7 +121,7 @@ static void isa_ide_class_initfn(ObjectClass *klass, void
*data)
}
static const TypeInfo isa_ide_info = {
- .name = "isa-ide",
+ .name = TYPE_ISA_IDE,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAIDEState),
.class_init = isa_ide_class_initfn,
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.5 v2 00/20] QOM realize for ISA, part 1, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 02/20] cirrus_vga: QOM'ify ISA Cirrus VGA, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 01/20] applesmc: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 04/20] i82374: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 03/20] fdc: QOM'ify ISA floppy controller, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 07/20] m48t59: QOM'ify ISA M48T59 NVRAM, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 06/20] ide: QOM'ify ISA IDE,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.5 v2 05/20] i8259: QOM cleanups, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 10/20] parallel: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 08/20] mc146818rtc: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 09/20] ne2000-isa: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 11/20] pc: QOM'ify port 92, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 12/20] pckbd: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 13/20] pcspk: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 14/20] sb16: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 15/20] serial: QOM'ify ISA serial, Andreas Färber, 2013/04/27