Commit d8438bd2 authored by Raphael Norwitz's avatar Raphael Norwitz Committed by Michael S. Tsirkin
Browse files

vhost-user-blk: prevent using uninitialized vqs 



Same rational as: e6cc11d6

Of the 3 virtqueues, seabios only sets cmd, leaving ctrl
and event without a physical address. This can cause
vhost_verify_ring_part_mapping to return ENOMEM, causing
the following logs:

qemu-system-x86_64: Unable to map available ring for ring 0
qemu-system-x86_64: Verify ring failure on region 0

This has already been fixed for vhost scsi devices and was
recently vhost-user scsi devices. This commit fixes it for
vhost-user-blk devices.

Suggested-by: default avatarPhillippe Mathieu-Daude <philmd@redhat.com>
Signed-off-by: default avatarRaphael Norwitz <raphael.norwitz@nutanix.com>
Message-Id: <1566498865-55506-1-git-send-email-raphael.norwitz@nutanix.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent d8b92bd4

hw/block/vhost-user-blk.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) 
    }



    s->inflight = g_new0(struct vhost_inflight, 1);

    s->vqs = g_new(struct vhost_virtqueue, s->num_queues);

    s->vqs = g_new0(struct vhost_virtqueue, s->num_queues);

    s->watch = 0;

    s->connected = false;