From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sld8k-00047z-OM for qemu-devel@nongnu.org; Mon, 02 Jul 2012 05:42:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sld8c-0006au-Rp for qemu-devel@nongnu.org; Mon, 02 Jul 2012 05:41:54 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:35220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sld8c-0006Xr-J7 for qemu-devel@nongnu.org; Mon, 02 Jul 2012 05:41:46 -0400 Received: by mail-wi0-f181.google.com with SMTP id hm2so2421641wib.10 for ; Mon, 02 Jul 2012 02:41:45 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 2 Jul 2012 11:41:22 +0200 Message-Id: <1341222087-24920-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1341222087-24920-1-git-send-email-pbonzini@redhat.com> References: <1341222087-24920-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 09/14] virtio-scsi: do not crash on adding buffers to the event queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The event queue is not supported yet and the handler does not have to do much anyway when buffers are added. However, the handler is called unconditionally by the virtio layer, and this results in a crash as soon as buffers are added to the event queue because we pass NULL. Reported-by: Bryan Venteicher Signed-off-by: Paolo Bonzini --- hw/virtio-scsi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index e1a767e..0a5ac40 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -405,6 +405,10 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) } } +static void virtio_scsi_handle_event(VirtIODevice *vdev, VirtQueue *vq) +{ +} + static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, size_t resid) { @@ -609,7 +613,7 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf) s->ctrl_vq = virtio_add_queue(&s->vdev, VIRTIO_SCSI_VQ_SIZE, virtio_scsi_handle_ctrl); s->event_vq = virtio_add_queue(&s->vdev, VIRTIO_SCSI_VQ_SIZE, - NULL); + virtio_scsi_handle_event); for (i = 0; i < s->conf->num_queues; i++) { s->cmd_vqs[i] = virtio_add_queue(&s->vdev, VIRTIO_SCSI_VQ_SIZE, virtio_scsi_handle_cmd); -- 1.7.10.2