Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

[qemu.git] / hw / ide / isa.c

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index fb7bb8201db3269128fa10900e4851029f4d9782..40213d662ce63f3a86923f4b9faa43d53d6fa4e5 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -22,19 +22,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */

-#include <hw/hw.h>
-#include <hw/pc.h>
-#include <hw/isa.h>
-#include "block/block.h"
+#include "qemu/osdep.h"
+#include "hw/hw.h"
+#include "hw/i386/pc.h"
+#include "hw/isa/isa.h"
+#include "sysemu/block-backend.h"

 #include "sysemu/dma.h"
 
 #include "sysemu/dma.h"
 

-#include <hw/ide/internal.h>
+#include "hw/ide/internal.h"

 
 /***********************************************************/
 /* ISA IDE definitions */
 
 
 /***********************************************************/
 /* ISA IDE definitions */
 

+#define TYPE_ISA_IDE "isa-ide"
+#define ISA_IDE(obj) OBJECT_CHECK(ISAIDEState, (obj), TYPE_ISA_IDE)
+

 typedef struct ISAIDEState {
 typedef struct ISAIDEState {

-    ISADevice dev;
+    ISADevice parent_obj;
+

     IDEBus    bus;
     uint32_t  iobase;
     uint32_t  iobase2;
     IDEBus    bus;
     uint32_t  iobase;
     uint32_t  iobase2;


@@ -44,7 +49,7 @@ typedef struct ISAIDEState {
 
 static void isa_ide_reset(DeviceState *d)
 {
 
 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);
 }
 
     ide_bus_reset(&s->bus);
 }


@@ -53,50 +58,53 @@ static const VMStateDescription vmstate_ide_isa = {
     .name = "isa-ide",
     .version_id = 3,
     .minimum_version_id = 0,
     .name = "isa-ide",
     .version_id = 3,
     .minimum_version_id = 0,

-    .minimum_version_id_old = 0,
-    .fields      = (VMStateField []) {
+    .fields = (VMStateField[]) {

         VMSTATE_IDE_BUS(bus, ISAIDEState),
         VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState),
         VMSTATE_END_OF_LIST()
     }
 };
 
         VMSTATE_IDE_BUS(bus, ISAIDEState),
         VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState),
         VMSTATE_END_OF_LIST()
     }
 };
 

-static int isa_ide_initfn(ISADevice *dev)
+static void isa_ide_realizefn(DeviceState *dev, Error **errp)

 {
 {

-    ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev);
+    ISADevice *isadev = ISA_DEVICE(dev);
+    ISAIDEState *s = ISA_IDE(dev);

 
 

-    ide_bus_new(&s->bus, &s->dev.qdev, 0);
-    ide_init_ioport(&s->bus, dev, s->iobase, s->iobase2);
-    isa_init_irq(dev, &s->irq, s->isairq);
+    ide_bus_new(&s->bus, sizeof(s->bus), dev, 0, 2);
+    ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);
+    isa_init_irq(isadev, &s->irq, s->isairq);

     ide_init2(&s->bus, s->irq);
     ide_init2(&s->bus, s->irq);

-    vmstate_register(&dev->qdev, 0, &vmstate_ide_isa, s);
-    return 0;
-};
+    vmstate_register(dev, 0, &vmstate_ide_isa, s);
+    ide_register_restart_cb(&s->bus);
+}

 
 ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
                         DriveInfo *hd0, DriveInfo *hd1)
 {
 
 ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
                         DriveInfo *hd0, DriveInfo *hd1)
 {

-    ISADevice *dev;
+    DeviceState *dev;
+    ISADevice *isadev;

     ISAIDEState *s;
 
     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)
-        return NULL;
+    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);
+    qdev_init_nofail(dev);

 
 

-    s = DO_UPCAST(ISAIDEState, dev, dev);
-    if (hd0)
+    s = ISA_IDE(dev);
+    if (hd0) {

         ide_create_drive(&s->bus, 0, hd0);
         ide_create_drive(&s->bus, 0, hd0);

-    if (hd1)
+    }
+    if (hd1) {

         ide_create_drive(&s->bus, 1, hd1);
         ide_create_drive(&s->bus, 1, hd1);

-    return dev;
+    }
+    return isadev;

 }
 
 static Property isa_ide_properties[] = {
 }
 
 static Property isa_ide_properties[] = {

-    DEFINE_PROP_HEX32("iobase",  ISAIDEState, iobase,  0x1f0),
-    DEFINE_PROP_HEX32("iobase2", ISAIDEState, iobase2, 0x3f6),
+    DEFINE_PROP_UINT32("iobase",  ISAIDEState, iobase,  0x1f0),
+    DEFINE_PROP_UINT32("iobase2", ISAIDEState, iobase2, 0x3f6),

     DEFINE_PROP_UINT32("irq",    ISAIDEState, isairq,  14),
     DEFINE_PROP_END_OF_LIST(),
 };
     DEFINE_PROP_UINT32("irq",    ISAIDEState, isairq,  14),
     DEFINE_PROP_END_OF_LIST(),
 };


@@ -104,15 +112,16 @@ static Property isa_ide_properties[] = {
 static void isa_ide_class_initfn(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
 static void isa_ide_class_initfn(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);

-    ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
-    ic->init = isa_ide_initfn;
+
+    dc->realize = isa_ide_realizefn;

     dc->fw_name = "ide";
     dc->reset = isa_ide_reset;
     dc->props = isa_ide_properties;
     dc->fw_name = "ide";
     dc->reset = isa_ide_reset;
     dc->props = isa_ide_properties;

+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }
 
 static const TypeInfo isa_ide_info = {
 }
 
 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,
     .parent        = TYPE_ISA_DEVICE,
     .instance_size = sizeof(ISAIDEState),
     .class_init    = isa_ide_class_initfn,