From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEWZx-0006IJ-C0 for qemu-devel@nongnu.org; Mon, 13 Jul 2015 01:47:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEWZw-0006Ip-8Q for qemu-devel@nongnu.org; Mon, 13 Jul 2015 01:47:01 -0400 From: Jason Wang Date: Mon, 13 Jul 2015 13:46:48 +0800 Message-Id: <1436766411-29144-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1436766411-29144-1-git-send-email-jasowang@redhat.com> References: <1436766411-29144-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH 2/5] virtio-blk: disable scsi passthrough for 1.0 device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mst@redhat.com Cc: Kevin Wolf , Jason Wang , qemu-block@nongnu.org, Stefan Hajnoczi VIRTIO_BLK_F_SCSI was no longer supported in 1.0. So disable it. Cc: Stefan Hajnoczi Cc: Kevin Wolf Cc: qemu-block@nongnu.org Signed-off-by: Jason Wang --- hw/block/virtio-blk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 6aefda4..f30ad25 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -730,7 +730,8 @@ 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)) + 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