diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-06-12 18:37:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-07-02 11:27:00 +0200 |
| commit | 619d7ae952bb61ec27ec21fe4a383a8d4dd4cd70 (patch) | |
| tree | ee97bc4c2a8b74b3a451774d41364ffff3dde413 | |
| parent | e8f943c3bcc2a578bfd30b825f2ebaf345c63a09 (diff) | |
| download | focaccia-qemu-619d7ae952bb61ec27ec21fe4a383a8d4dd4cd70.tar.gz focaccia-qemu-619d7ae952bb61ec27ec21fe4a383a8d4dd4cd70.zip | |
virtio-scsi: do not crash on adding buffers to the event queue
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 <bryanv@daemoninthecloset.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/virtio-scsi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index e1a767ea78..0a5ac40e2f 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); |