[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] virtio-scsi: do not crash on adding buffers t
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/10] virtio-scsi: do not crash on adding buffers to the event queue |
Date: |
Tue, 12 Jun 2012 18:42:42 +0200 |
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 5e39ce9..1841a71 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
- [Qemu-devel] [PULL 00/10] SCSI updates for 2012-06-12, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 01/10] scsi: simplify handling of the VPD page length field, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 03/10] atapi: implement READ DISC INFORMATION, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 02/10] scsi: add a qdev property for the disk's WWN, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 04/10] scsi-disk: implement READ DISC INFORMATION, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 06/10] ISCSI: force use of sg for SMC and SSC devices, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 05/10] ISCSI: Add SCSI passthrough via scsi-generic to libiscsi, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 07/10] megasas: Add header file, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 08/10] megasas: LSI Megaraid SAS HBA emulation, Paolo Bonzini, 2012/06/12
- [Qemu-devel] [PATCH 10/10] virtio-scsi: do not crash on adding buffers to the event queue,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/10] megasas: Add trace events, Paolo Bonzini, 2012/06/12
- Re: [Qemu-devel] [PULL 00/10] SCSI updates for 2012-06-12, Anthony Liguori, 2012/06/20