Commit 3400c455 authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Anthony Liguori
Browse files

virtio-blk-ccw switch to new API. 



Here the virtio-ccw-s390 is modified for the new API. The device
virtio-ccw-s390 extends virtio-ccw-device as before. It creates and
connects a virtio-ccw during the init. The properties are not modified.

Signed-off-by: default avatarKONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1363624648-16906-9-git-send-email-fred.konrad@greensocs.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 55d11e01

hw/s390x/virtio-ccw.c

+18 −15
Original line number Diff line number Diff line
@@ -570,22 +570,24 @@ static int virtio_ccw_net_exit(VirtioCcwDevice *dev) 
    return virtio_ccw_exit(dev);

}



static int virtio_ccw_blk_init(VirtioCcwDevice *dev)

static int virtio_ccw_blk_init(VirtioCcwDevice *ccw_dev)

{

    VirtIODevice *vdev;



    vdev = virtio_blk_init((DeviceState *)dev, &dev->blk);

    if (!vdev) {

    VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(ccw_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);

    virtio_blk_set_conf(vdev, &(dev->blk));

    qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));

    if (qdev_init(vdev) < 0) {

        return -1;

    }



    return virtio_ccw_device_init(dev, vdev);

    return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev));

}



static int virtio_ccw_blk_exit(VirtioCcwDevice *dev)

static void virtio_ccw_blk_instance_init(Object *obj)

{

    virtio_blk_exit(dev->vdev);

    return virtio_ccw_exit(dev);

    VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(obj);

    object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BLK);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);

}



static int virtio_ccw_serial_init(VirtioCcwDevice *dev)
@@ -754,10 +756,10 @@ static const TypeInfo virtio_ccw_net = { 


static Property virtio_ccw_blk_properties[] = {

    DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),

    DEFINE_BLOCK_PROPERTIES(VirtioCcwDevice, blk.conf),

    DEFINE_PROP_STRING("serial", VirtioCcwDevice, blk.serial),

    DEFINE_BLOCK_PROPERTIES(VirtIOBlkCcw, blk.conf),

    DEFINE_PROP_STRING("serial", VirtIOBlkCcw, blk.serial),

#ifdef __linux__

    DEFINE_PROP_BIT("scsi", VirtioCcwDevice, blk.scsi, 0, true),

    DEFINE_PROP_BIT("scsi", VirtIOBlkCcw, blk.scsi, 0, true),

#endif

    DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]),

    DEFINE_PROP_END_OF_LIST(),
@@ -769,15 +771,16 @@ static void virtio_ccw_blk_class_init(ObjectClass *klass, void *data) 
    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->init = virtio_ccw_blk_init;

    k->exit = virtio_ccw_blk_exit;

    k->exit = virtio_ccw_exit;

    dc->reset = virtio_ccw_reset;

    dc->props = virtio_ccw_blk_properties;

}



static const TypeInfo virtio_ccw_blk = {

    .name          = "virtio-blk-ccw",

    .name          = TYPE_VIRTIO_BLK_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VirtioCcwDevice),

    .instance_size = sizeof(VirtIOBlkCcw),

    .instance_init = virtio_ccw_blk_instance_init,

    .class_init    = virtio_ccw_blk_class_init,

};

hw/s390x/virtio-ccw.h

+13 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ struct VirtioCcwDevice { 
    SubchDev *sch;

    VirtIODevice *vdev;

    char *bus_id;

    VirtIOBlkConf blk;

    NICConf nic;

    uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE];

    virtio_serial_conf serial;
@@ -94,6 +93,19 @@ typedef struct VirtualCssBus { 
#define VIRTUAL_CSS_BUS(obj) \

     OBJECT_CHECK(VirtualCssBus, (obj), TYPE_VIRTUAL_CSS_BUS)



/* virtio-blk-ccw */



#define TYPE_VIRTIO_BLK_CCW "virtio-blk-ccw"

#define VIRTIO_BLK_CCW(obj) \

        OBJECT_CHECK(VirtIOBlkCcw, (obj), TYPE_VIRTIO_BLK_CCW)



typedef struct VirtIOBlkCcw {

    VirtioCcwDevice parent_obj;

    VirtIOBlock vdev;

    VirtIOBlkConf blk;

} VirtIOBlkCcw;





VirtualCssBus *virtual_css_bus_init(void);

void virtio_ccw_device_update_status(SubchDev *sch);

VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);