From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHqGx-0006mn-KL for qemu-devel@nongnu.org; Wed, 22 Jul 2015 05:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHqGt-0005Kn-Ks for qemu-devel@nongnu.org; Wed, 22 Jul 2015 05:25:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57015) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHqGt-0005KA-GY for qemu-devel@nongnu.org; Wed, 22 Jul 2015 05:25:03 -0400 Date: Wed, 22 Jul 2015 12:25:00 +0300 From: "Michael S. Tsirkin" Message-ID: <20150722122139-mutt-send-email-mst@redhat.com> References: <1437544792-3949-1-git-send-email-jasowang@redhat.com> <1437544792-3949-3-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437544792-3949-3-git-send-email-jasowang@redhat.com> Subject: Re: [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: Jason Wang Cc: cornelia.huck@de.ibm.com, pbonzini@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com On Wed, Jul 22, 2015 at 01:59:51PM +0800, Jason Wang wrote: > 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!"); A bit better: "Virtio modern does not support scsi passthrough - please set disable-modern=on". It might be even better if we could specify the device that failed the initialization, but I don't know how to do that in a way that's helpful to the user. Markus? > + 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