Commit 1c028ddf authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Anthony Liguori
Browse files

virtio-blk: add the virtio-blk device. 



Create virtio-blk which extends virtio-device, so it can be connected on
virtio-bus.

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

hw/virtio-blk.c

+93 −5
Original line number Diff line number Diff line
@@ -21,7 +21,11 @@ 
#ifdef __linux__

# include <scsi/sg.h>

#endif

#include "hw/virtio-bus.h"



/*

 * Moving to QOM later in this series.

 */

static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev)

{

    return (VirtIOBlock *)vdev;
@@ -620,9 +624,16 @@ static const BlockDevOps virtio_block_ops = { 
    .resize_cb = virtio_blk_resize,

};



VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk)

void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk)

{

    VirtIOBlock *s;

    VirtIOBlock *s = VIRTIO_BLK(dev);

    memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf));

}



static VirtIODevice *virtio_blk_common_init(DeviceState *dev,

                                          VirtIOBlkConf *blk, VirtIOBlock **ps)

{

    VirtIOBlock *s = *ps;

    static int virtio_blk_id;



    if (!blk->conf.bs) {
@@ -639,9 +650,20 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) 
        return NULL;

    }



    /*

     * We have two cases here: the old virtio-blk-pci device, and the

     * refactored virtio-blk.

     */

    if (s == NULL) {

        /* virtio-blk-pci */

        s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK,

                                              sizeof(struct virtio_blk_config),

                                              sizeof(VirtIOBlock));

    } else {

        /* virtio-blk */

        virtio_init(VIRTIO_DEVICE(s), "virtio-blk", VIRTIO_ID_BLOCK,

                    sizeof(struct virtio_blk_config));

    }



    s->vdev.get_config = virtio_blk_update_config;

    s->vdev.set_config = virtio_blk_set_config;
@@ -675,6 +697,12 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) 
    return &s->vdev;

}



VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk)

{

    VirtIOBlock *s = NULL;

    return virtio_blk_common_init(dev, blk, &s);

}



void virtio_blk_exit(VirtIODevice *vdev)

{

    VirtIOBlock *s = to_virtio_blk(vdev);
@@ -688,3 +716,63 @@ void virtio_blk_exit(VirtIODevice *vdev) 
    blockdev_mark_auto_del(s->bs);

    virtio_cleanup(vdev);

}





static int virtio_blk_device_init(VirtIODevice *vdev)

{

    DeviceState *qdev = DEVICE(vdev);

    VirtIOBlock *s = VIRTIO_BLK(vdev);

    VirtIOBlkConf *blk = &(s->blk);

    if (virtio_blk_common_init(qdev, blk, &s) == NULL) {

        return -1;

    }

    return 0;

}



static int virtio_blk_device_exit(DeviceState *dev)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(dev);

    VirtIOBlock *s = VIRTIO_BLK(dev);

#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE

    virtio_blk_data_plane_destroy(s->dataplane);

    s->dataplane = NULL;

#endif

    qemu_del_vm_change_state_handler(s->change);

    unregister_savevm(s->qdev, "virtio-blk", s);

    blockdev_mark_auto_del(s->bs);

    virtio_common_cleanup(vdev);

    return 0;

}



static Property virtio_blk_properties[] = {

    DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlock, blk),

    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_blk_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);

    dc->exit = virtio_blk_device_exit;

    dc->props = virtio_blk_properties;

    vdc->init = virtio_blk_device_init;

    vdc->get_config = virtio_blk_update_config;

    vdc->set_config = virtio_blk_set_config;

    vdc->get_features = virtio_blk_get_features;

    vdc->set_status = virtio_blk_set_status;

    vdc->reset = virtio_blk_reset;

}



static const TypeInfo virtio_device_info = {

    .name = TYPE_VIRTIO_BLK,

    .parent = TYPE_VIRTIO_DEVICE,

    .instance_size = sizeof(VirtIOBlock),

    .class_init = virtio_blk_class_init,

};



static void virtio_register_types(void)

{

    type_register_static(&virtio_device_info);

}



type_init(virtio_register_types)

hw/virtio-blk.h

+21 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
#include "dataplane/virtio-blk.h"

#endif



#define TYPE_VIRTIO_BLK "virtio-blk"

#define VIRTIO_BLK(obj) \

        OBJECT_CHECK(VirtIOBlock, (obj), TYPE_VIRTIO_BLK)



/* from Linux's linux/virtio_blk.h */



/* The ID for virtio_block */
@@ -130,4 +134,21 @@ typedef struct VirtIOBlock { 
#define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \

        DEFINE_VIRTIO_COMMON_FEATURES(_state, _field)



#ifdef __linux__

#define DEFINE_VIRTIO_BLK_PROPERTIES(_state, _field)                          \

        DEFINE_BLOCK_PROPERTIES(_state, _field.conf),                         \

        DEFINE_BLOCK_CHS_PROPERTIES(_state, _field.conf),                     \

        DEFINE_PROP_STRING("serial", _state, _field.serial),                  \

        DEFINE_PROP_BIT("config-wce", _state, _field.config_wce, 0, true),    \

        DEFINE_PROP_BIT("scsi", _state, _field.scsi, 0, true)

#else

#define DEFINE_VIRTIO_BLK_PROPERTIES(_state, _field)                          \

        DEFINE_BLOCK_PROPERTIES(_state, _field.conf),                         \

        DEFINE_BLOCK_CHS_PROPERTIES(_state, _field.conf),                     \

        DEFINE_PROP_STRING("serial", _state, _field.serial),                  \

        DEFINE_PROP_BIT("config-wce", _state, _field.config_wce, 0, true)

#endif /* __linux__ */



void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk);



#endif

hw/virtio-pci.c

+1 −7
Original line number Diff line number Diff line
@@ -1084,19 +1084,13 @@ static void virtio_rng_exit_pci(PCIDevice *pci_dev) 


static Property virtio_blk_properties[] = {

    DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),

    DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, blk.conf),

    DEFINE_BLOCK_CHS_PROPERTIES(VirtIOPCIProxy, blk.conf),

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

#ifdef __linux__

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

#endif

    DEFINE_PROP_BIT("config-wce", VirtIOPCIProxy, blk.config_wce, 0, true),

    DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),

#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE

    DEFINE_PROP_BIT("x-data-plane", VirtIOPCIProxy, blk.data_plane, 0, false),

#endif

    DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),

    DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features),

    DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOPCIProxy, blk),

    DEFINE_PROP_END_OF_LIST(),

};