Commit 5d4c1ed3 authored by Raphael Norwitz's avatar Raphael Norwitz Committed by Stefan Hajnoczi
Browse files

vhost-user-scsi: prevent using uninitialized vqs 



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

The qemu commit e6cc11d6
has already resolved the issue for vhost scsi devices but
the fix was never applied to vhost-user scsi devices.

Signed-off-by: default avatarRaphael Norwitz <raphael.norwitz@nutanix.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1560299717-177734-1-git-send-email-raphael.norwitz@nutanix.com
Message-Id: <1560299717-177734-1-git-send-email-raphael.norwitz@nutanix.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent f0f81002

hw/scsi/vhost-user-scsi.c

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



    vsc->dev.nvqs = 2 + vs->conf.num_queues;

    vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs);

    vsc->dev.vqs = g_new0(struct vhost_virtqueue, vsc->dev.nvqs);

    vsc->dev.vq_index = 0;

    vsc->dev.backend_features = 0;

    vqs = vsc->dev.vqs;