qdev: set properties with device_class_set_props()

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

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index aa026c7a627bdb5d2b9bedd28f5cc34bc6e9a5cf..8395807b08ad4f86632cb7f3670971e1e8032c6a 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -22,50 +22,115 @@
  * 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 "block.h"
-#include "block_int.h"
-#include "sysemu.h"
-#include "dma.h"
 
-#include <hw/ide/internal.h>
+#include "qemu/osdep.h"
+#include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "qemu/module.h"
+#include "sysemu/dma.h"
+
+#include "hw/ide/internal.h"
 
 /***********************************************************/
 /* ISA IDE definitions */
 
+#define TYPE_ISA_IDE "isa-ide"
+#define ISA_IDE(obj) OBJECT_CHECK(ISAIDEState, (obj), TYPE_ISA_IDE)
+
 typedef struct ISAIDEState {
-    IDEBus *bus;
+    ISADevice parent_obj;
+
+    IDEBus    bus;
+    uint32_t  iobase;
+    uint32_t  iobase2;
+    uint32_t  isairq;
+    qemu_irq  irq;
 } ISAIDEState;
 
-static void isa_ide_save(QEMUFile* f, void *opaque)
+static void isa_ide_reset(DeviceState *d)
 {
-    ISAIDEState *s = opaque;
+    ISAIDEState *s = ISA_IDE(d);
 
-    idebus_save(f, s->bus);
-    ide_save(f, &s->bus->ifs[0]);
-    ide_save(f, &s->bus->ifs[1]);
+    ide_bus_reset(&s->bus);
 }
 
-static int isa_ide_load(QEMUFile* f, void *opaque, int version_id)
+static const VMStateDescription vmstate_ide_isa = {
+    .name = "isa-ide",
+    .version_id = 3,
+    .minimum_version_id = 0,
+    .fields = (VMStateField[]) {
+        VMSTATE_IDE_BUS(bus, ISAIDEState),
+        VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void isa_ide_realizefn(DeviceState *dev, Error **errp)
 {
-    ISAIDEState *s = opaque;
+    ISADevice *isadev = ISA_DEVICE(dev);
+    ISAIDEState *s = ISA_IDE(dev);
 
-    idebus_load(f, s->bus, version_id);
-    ide_load(f, &s->bus->ifs[0], version_id);
-    ide_load(f, &s->bus->ifs[1], version_id);
-    return 0;
+    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);
+    vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s);
+    ide_register_restart_cb(&s->bus);
 }
 
-void isa_ide_init(int iobase, int iobase2, qemu_irq irq,
-                  BlockDriverState *hd0, BlockDriverState *hd1)
+ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
+                        DriveInfo *hd0, DriveInfo *hd1)
 {
+    DeviceState *dev;
+    ISADevice *isadev;
     ISAIDEState *s;
 
-    s = qemu_mallocz(sizeof(*s));
-    s->bus = qemu_mallocz(sizeof(IDEBus));
+    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 = ISA_IDE(dev);
+    if (hd0) {
+        ide_create_drive(&s->bus, 0, hd0);
+    }
+    if (hd1) {
+        ide_create_drive(&s->bus, 1, hd1);
+    }
+    return isadev;
+}
+
+static Property isa_ide_properties[] = {
+    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(),
+};
 
-    ide_init2(s->bus, hd0, hd1, irq);
-    ide_init_ioport(s->bus, iobase, iobase2);
-    register_savevm("isa-ide", 0, 3, isa_ide_save, isa_ide_load, s);
+static void isa_ide_class_initfn(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    dc->realize = isa_ide_realizefn;
+    dc->fw_name = "ide";
+    dc->reset = isa_ide_reset;
+    device_class_set_props(dc, isa_ide_properties);
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
+
+static const TypeInfo isa_ide_info = {
+    .name          = TYPE_ISA_IDE,
+    .parent        = TYPE_ISA_DEVICE,
+    .instance_size = sizeof(ISAIDEState),
+    .class_init    = isa_ide_class_initfn,
+};
+
+static void isa_ide_register_types(void)
+{
+    type_register_static(&isa_ide_info);
+}
+
+type_init(isa_ide_register_types)