From patchwork Wed Jul 15 05:30:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 495406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7FF2F1402C2 for ; Wed, 15 Jul 2015 15:31:20 +1000 (AEST) Received: from localhost ([::1]:33831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFFHq-0002Su-Ej for incoming@patchwork.ozlabs.org; Wed, 15 Jul 2015 01:31:18 -0400 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 Received: from mx1.redhat.com ([209.132.183.28]:55413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFFGz-0000R4-Kv; Wed, 15 Jul 2015 01:30:25 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 4DBC28E6EC; Wed, 15 Jul 2015 05:30:25 +0000 (UTC) Received: from jason-ThinkPad-T430s.nay.redhat.com (dhcp-14-122.nay.redhat.com [10.66.14.122]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6F5U2RU010359; Wed, 15 Jul 2015 01:30:22 -0400 From: Jason Wang To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-block@nongnu.org, mst@redhat.com, Jason Wang , stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH V2 4/5] virtio-blk: fail the init when both 1.0 and scsi is set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }