From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHn4b-0002cq-DP for qemu-devel@nongnu.org; Wed, 22 Jul 2015 02:00:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHn4a-0006BX-L7 for qemu-devel@nongnu.org; Wed, 22 Jul 2015 02:00:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54796) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHn4a-0006Ae-9T for qemu-devel@nongnu.org; Wed, 22 Jul 2015 02:00:08 -0400 From: Jason Wang Date: Wed, 22 Jul 2015 13:59:51 +0800 Message-Id: <1437544792-3949-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1437544792-3949-1-git-send-email-jasowang@redhat.com> References: <1437544792-3949-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH V3 2/3] 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 SCSI passthrough was no longer supported in virtio 1.0, so this patch fail the get_features() when both 1.0 and scsi is set. And also only advertise VIRTIO_BLK_F_SCSI for legacy virtio-blk device. Signed-off-by: Jason Wang --- hw/block/virtio-blk.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 4c27974..4716c3e 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -731,7 +731,14 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features, virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY); virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY); virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE); - virtio_add_feature(&features, VIRTIO_BLK_F_SCSI); + if (__virtio_has_feature(features, VIRTIO_F_VERSION_1)) { + if (s->conf.scsi) { + error_setg(errp, "Virtio 1.0 does not support scsi passthrough!"); + return 0; + } + } else { + virtio_add_feature(&features, VIRTIO_BLK_F_SCSI); + } if (s->conf.config_wce) { virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE); -- 2.1.4