summaryrefslogtreecommitdiff
path: root/drivers/vhost
diff options
context:
space:
mode:
authorAsias He <asias@redhat.com>2013-05-07 14:51:49 +0800
committerMichael S. Tsirkin <mst@redhat.com>2013-05-07 11:11:08 +0300
commita18cc421649dfdc21edb6c4c867dd05447d7df8c (patch)
treee7509de7899b4ff9c10e40c5db95486575e5a334 /drivers/vhost
parent7542a6b0d273ba4338028d39bc0e6e8cbfc68898 (diff)
downloadlinux-3.10-a18cc421649dfdc21edb6c4c867dd05447d7df8c.tar.gz
linux-3.10-a18cc421649dfdc21edb6c4c867dd05447d7df8c.tar.bz2
linux-3.10-a18cc421649dfdc21edb6c4c867dd05447d7df8c.zip
vhost-scsi: Enable VIRTIO_RING_F_EVENT_IDX
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>
Diffstat (limited to 'drivers/vhost')
-rw-r--r--drivers/vhost/scsi.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 5179f7aa1b0..70142029722 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -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