Commit aeb98ddc authored by Gonglei's avatar Gonglei Committed by Gerd Hoffmann
Browse files

virtio-blk: alias bootindex property explicitly for virt-blk-pci/ccw/s390 



Since the "bootindex" property is a QOM property and not a qdev property
now, we must alias it explicitly for virtio-blk-pci, as well as CCW and
s390-virtio.

Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 8dece34f

hw/s390x/s390-virtio-bus.c

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ static void s390_virtio_blk_instance_init(Object *obj) 
                                TYPE_VIRTIO_BLK);

    object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",

                              &error_abort);

    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),

                              "bootindex", &error_abort);

}



static int s390_virtio_serial_init(VirtIOS390Device *s390_dev)

hw/s390x/virtio-ccw.c

+2 −0
Original line number Diff line number Diff line
@@ -819,6 +819,8 @@ static void virtio_ccw_blk_instance_init(Object *obj) 
                                TYPE_VIRTIO_BLK);

    object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",

                              &error_abort);

    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),

                              "bootindex", &error_abort);

}



static int virtio_ccw_serial_init(VirtioCcwDevice *ccw_dev)

hw/virtio/virtio-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,8 @@ static void virtio_blk_pci_instance_init(Object *obj) 
                                TYPE_VIRTIO_BLK);

    object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",

                              &error_abort);

    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),

                              "bootindex", &error_abort);

}



static const TypeInfo virtio_blk_pci_info = {