Virtualization - May 2013 - [PATCH] vhost-scsi: Enable VIRTIO_RING_F_EVENT_IDX

It is disabled as a workaround. Now userspace bits works fine with it.
So, let's enable it.

Signed-off-by: Asias He <asias at redhat.com>
---
 drivers/vhost/scsi.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index d860b58..5531ebc 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -160,14 +160,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
-- 
1.8.1.4

Il 07/05/2013 08:51, Asias He ha scritto:
> It is disabled as a workaround. Now userspace bits works fine with it.
> So, let's enable it.
> 
> Signed-off-by: Asias He <asias at redhat.com>
> ---
>  drivers/vhost/scsi.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
> index d860b58..5531ebc 100644
> --- a/drivers/vhost/scsi.c
> +++ b/drivers/vhost/scsi.c
> @@ -160,14 +160,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
> 
The broken version was not ever committed to QEMU, I guess the same is
true for nlkt.

Acked-by: Paolo Bonzini <pbonzini at redhat.com>

Paolo