From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFFH2-0001IP-Do for qemu-devel@nongnu.org; Wed, 15 Jul 2015 01:30:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFFH1-0000S0-JU for qemu-devel@nongnu.org; Wed, 15 Jul 2015 01:30:28 -0400 From: Jason Wang Date: Wed, 15 Jul 2015 13:30:00 +0800 Message-Id: <1436938201-16766-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1436938201-16766-1-git-send-email-jasowang@redhat.com> References: <1436938201-16766-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH V2 4/5] virtio-blk: fail the init when both 1.0 and scsi is set List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, qemu-block@nongnu.org, mst@redhat.com, Jason Wang , stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com Scsi passthrough was no longer supported in 1.0, so fail the initialization when user want both features. Cc: Stefan Hajnoczi Cc: Kevin Wolf Cc: qemu-block@nongnu.org Signed-off-by: Jason Wang --- hw/block/virtio-blk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 362fe53..4a0ef68 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -732,6 +732,10 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features, virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY); virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE); if (s->conf.scsi) { + if (__virtio_has_feature(features, VIRTIO_F_VERSION_1)) { + error_setg(errp, "Virtio 1.0 does not support scsi passthrough"); + return 0; + } virtio_add_feature(&features, VIRTIO_BLK_F_SCSI); } -- 2.1.4