Skip to content

Commit

Permalink
vhost-scsi: Enable VIRTIO_RING_F_EVENT_IDX
Browse files Browse the repository at this point in the history
It was disabled as a workaround. Now userspace bits work fine with it.
The broken version was not ever committed to QEMU, I guess the same is
true for nlkt.

So, let's enable it.

Signed-off-by: Asias He <asias@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Asias He authored and Michael S. Tsirkin committed May 7, 2013
1 parent 7542a6b commit a18cc42
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/vhost/scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,8 @@ enum {
VHOST_SCSI_VQ_IO = 2,
};

/*
* VIRTIO_RING_F_EVENT_IDX seems broken. Not sure the bug is in
* kernel but disabling it helps.
* TODO: debug and remove the workaround.
*/
enum {
VHOST_SCSI_FEATURES = (VHOST_FEATURES & (~VIRTIO_RING_F_EVENT_IDX)) |
(1ULL << VIRTIO_SCSI_F_HOTPLUG)
VHOST_SCSI_FEATURES = VHOST_FEATURES | (1ULL << VIRTIO_SCSI_F_HOTPLUG)
};

#define VHOST_SCSI_MAX_TARGET 256
Expand Down

0 comments on commit a18cc42

Please sign in to comment.