Re: [Qemu-devel] [PATCH] fixup! virtio-blk: fail get_features when both scsi and 1.0 were set

[Cornelia Huck]

On Mon, 27 Jul 2015 13:41:32 +0200
Paolo Bonzini <address@hidden> wrote:

> Tweak the error message so that it does not mention SCSI passthrough.  That
> can be confusing because you can have scsi=on even for file-backed image,
> which obviously do not support SCSI passthrough at the block layer level.
> 
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  hw/block/virtio-blk.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index 9acbc3a..7bed3f0 100644
> --- a/hw/block/virtio-blk.c
> +++ b/hw/block/virtio-blk.c
> @@ -734,7 +734,7 @@ static uint64_t virtio_blk_get_features(VirtIODevice 
> *vdev, uint64_t features,
>      virtio_clear_feature(&features, VIRTIO_F_ANY_LAYOUT);
>      if (__virtio_has_feature(features, VIRTIO_F_VERSION_1)) {
>          if (s->conf.scsi) {
> -            error_setg(errp, "Virtio 1.0 does not support scsi 
> passthrough!");
> +            error_setg(errp, "Please set scsi=off for virtio-blk devices in 
> order to use virtio 1.0");
>              return 0;
>          }
>          virtio_add_feature(&features, VIRTIO_F_ANY_LAYOUT);

I like that message much better.