Add request_vqs/free_vqs calls to virtio_blk. These will be required for MSI support.
Signed-off-by: Michael S. Tsirkin <[email protected]> --- drivers/block/virtio_blk.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 5d34764..523eddc 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -224,10 +224,14 @@ static int virtblk_probe(struct virtio_device *vdev) sg_init_table(vblk->sg, vblk->sg_elems); /* We expect one virtqueue, for output. */ + err = virtio_request_vqs(vdev, 1); + if (err) + goto out_free_vblk; + vblk->vq = vdev->config->find_vq(vdev, 0, blk_done); if (IS_ERR(vblk->vq)) { err = PTR_ERR(vblk->vq); - goto out_free_vblk; + goto out_free_vqs; } vblk->pool = mempool_create_kmalloc_pool(1,sizeof(struct virtblk_req)); @@ -324,6 +328,8 @@ out_mempool: mempool_destroy(vblk->pool); out_free_vq: vdev->config->del_vq(vblk->vq); +out_free_vqs: + virtio_free_vqs(vdev); out_free_vblk: kfree(vblk); out: @@ -345,6 +351,7 @@ static void virtblk_remove(struct virtio_device *vdev) put_disk(vblk->disk); mempool_destroy(vblk->pool); vdev->config->del_vq(vblk->vq); + virtio_free_vqs(vdev); kfree(vblk); } -- 1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
