[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V9 10/12] virtio-blk-s390 : switch to the new API.
From: |
fred . konrad |
Subject: |
[Qemu-devel] [RFC V9 10/12] virtio-blk-s390 : switch to the new API. |
Date: |
Thu, 3 Jan 2013 15:52:22 +0100 |
From: KONRAD Frederic <address@hidden>
Here the virtio-blk-s390 is modified for the new API. The device
virtio-blk-s390 extends virtio-s390-device as before. It creates and
connects a virtio-blk during the init. The properties are not modified.
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/s390-virtio-bus.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index 4e8471b..a2ccdc0 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -165,14 +165,20 @@ static int s390_virtio_net_init(VirtIOS390Device *dev)
static int s390_virtio_blk_init(VirtIOS390Device *dev)
{
- VirtIODevice *vdev;
-
- vdev = virtio_blk_init((DeviceState *)dev, &dev->blk);
- if (!vdev) {
+ DeviceState *vdev = DEVICE(dev->vdev);
+ virtio_blk_set_conf(vdev, &(dev->blk));
+ qdev_set_parent_bus(vdev, BUS(dev->bus));
+ if (qdev_init(vdev) < 0) {
return -1;
}
+ return s390_virtio_device_init(dev, VIRTIO_DEVICE(vdev));
+}
- return s390_virtio_device_init(dev, vdev);
+static void s390_virtio_blk_instance_init(Object *obj)
+{
+ VirtIOS390Device *dev = VIRTIO_S390_DEVICE(obj);
+ dev->vdev = VIRTIO_DEVICE(object_new("virtio-blk"));
+ object_property_add_child(obj, "virtio-backend", OBJECT(dev->vdev), NULL);
}
static int s390_virtio_serial_init(VirtIOS390Device *dev)
@@ -436,6 +442,7 @@ static TypeInfo s390_virtio_blk = {
.name = "virtio-blk-s390",
.parent = TYPE_VIRTIO_S390_DEVICE,
.instance_size = sizeof(VirtIOS390Device),
+ .instance_init = s390_virtio_blk_instance_init,
.class_init = s390_virtio_blk_class_init,
};
--
1.7.11.7
- [Qemu-devel] [RFC V9 01/12] qdev : add a maximum device allowed field for the bus., (continued)
- [Qemu-devel] [RFC V9 01/12] qdev : add a maximum device allowed field for the bus., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 06/12] virtio-s390-bus : add virtio-s390-bus., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 03/12] virtio-pci-bus : introduce virtio-pci-bus., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 07/12] virtio-s390-device : create a virtio-s390-bus during init., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 05/12] virtio-device : refactor virtio-device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 02/12] virtio-bus : introduce virtio-bus, fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 04/12] virtio-pci : refactor virtio-pci device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 08/12] virtio-blk : add the virtio-blk device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 10/12] virtio-blk-s390 : switch to the new API.,
fred . konrad <=
- [Qemu-devel] [RFC V9 09/12] virtio-blk-pci : switch to new API., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 11/12] virtio-blk : cleanup : use QOM cast., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 12/12] virtio-blk : cleanup : remove qdev field., fred . konrad, 2013/01/03