Re: [Qemu-devel] [PATCH 2/2] dataplane: Support VIRTIO_BLK_T_SCSI_CMD

[Paolo Bonzini <pbonzini@redhat.com>]

Il 22/05/2014 08:36, Fam Zheng ha scritto:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  hw/block/dataplane/virtio-blk.c | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
> index 46a6824..6a66196 100644
> --- a/hw/block/dataplane/virtio-blk.c
> +++ b/hw/block/dataplane/virtio-blk.c
> @@ -201,6 +201,16 @@ static void do_flush_cmd(VirtIOBlockDataPlane *s, VirtQueueElement *elem,
>      bdrv_aio_flush(s->blk->conf.bs, complete_flush, req);
>  }
>
> +static void do_scsi_cmd(VirtIOBlockDataPlane *s, VirtQueueElement *elem,
> +                         QEMUIOVector *inhdr)
> +{
> +    int status;
> +
> +    status = virtio_blk_handle_scsi_req(s->blk->conf.bs, elem);
> +    complete_request_early(s, elem, inhdr, status);
> +
> +}
> +
>  static int process_request(VirtIOBlockDataPlane *s, VirtQueueElement *elem)
>  {
>      struct iovec *iov = elem->out_sg;
> @@ -249,8 +259,7 @@ static int process_request(VirtIOBlockDataPlane *s, VirtQueueElement *elem)
>          return 0;
>
>      case VIRTIO_BLK_T_SCSI_CMD:
> -        /* TODO support SCSI commands */
> -        complete_request_early(s, elem, inhdr, VIRTIO_BLK_S_UNSUPP);
> +        do_scsi_cmd(s, elem, inhdr);
>          return 0;
>
>      case VIRTIO_BLK_T_FLUSH:
> @@ -326,12 +335,6 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *blk,
>          return;
>      }
>
> -    if (blk->scsi) {
> -        error_setg(errp,
> -                   "device is incompatible with x-data-plane, use scsi=off");
> -        return;
> -    }
> -
>      /* If dataplane is (re-)enabled while the guest is running there could be
>       * block jobs that can conflict.
>       */
>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>