From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJgmq-0000jS-JY for qemu-devel@nongnu.org; Mon, 27 Jul 2015 07:41:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJgml-0002Gs-Hm for qemu-devel@nongnu.org; Mon, 27 Jul 2015 07:41:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33760) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJgml-0002Gm-C1 for qemu-devel@nongnu.org; Mon, 27 Jul 2015 07:41:35 -0400 From: Paolo Bonzini Date: Mon, 27 Jul 2015 13:41:32 +0200 Message-Id: <1437997292-21715-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] fixup! virtio-blk: fail get_features when both scsi and 1.0 were set List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: cornelia.huck@de.ibm.com, pbonzini@redhat.com, Jason Wang , mst@redhat.com 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 --- 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); -- 2.1.4