On Tue, Feb 03, 2015 at 06:30:00AM +0000, Nicholas A. Bellinger wrote:
> From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
>
> Signal support of VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 feature bits
> required for virtio-scsi 1.0 spec layout requirements.
>
> Cc: Michael S. Tsirkin <mst@xxxxxxxxxx>
> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
I'm hoping someone'll actually test this with a BE guest before
we release this though.
> ---
> drivers/vhost/scsi.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
> index e1fe003..c25fdd7 100644
> --- a/drivers/vhost/scsi.c
> +++ b/drivers/vhost/scsi.c
> @@ -173,7 +173,9 @@ enum {
> /* Note: can't set VIRTIO_F_VERSION_1 yet, since that implies ANY_LAYOUT. */
> enum {
> VHOST_SCSI_FEATURES = VHOST_FEATURES | (1ULL << VIRTIO_SCSI_F_HOTPLUG) |
> - (1ULL << VIRTIO_SCSI_F_T10_PI)
> + (1ULL << VIRTIO_SCSI_F_T10_PI) |
> + (1ULL << VIRTIO_F_ANY_LAYOUT) |
> + (1ULL << VIRTIO_F_VERSION_1)
> };
>
> #define VHOST_SCSI_MAX_TARGET 256
> @@ -1626,7 +1628,10 @@ static void vhost_scsi_handle_kick(struct vhost_work *work)
> poll.work);
> struct vhost_scsi *vs = container_of(vq->dev, struct vhost_scsi, dev);
>
> - vhost_scsi_handle_vq(vs, vq);
> + if (vhost_has_feature(vq, VIRTIO_F_ANY_LAYOUT))
> + vhost_scsi_handle_vqal(vs, vq);
> + else
> + vhost_scsi_handle_vq(vs, vq);
> }
>
> static void vhost_scsi_flush_vq(struct vhost_scsi *vs, int index)
> --
> 1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
