From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJgUc-0005I7-6b for qemu-devel@nongnu.org; Mon, 27 Jul 2015 07:22:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJgUY-00019V-48 for qemu-devel@nongnu.org; Mon, 27 Jul 2015 07:22:50 -0400 Date: Mon, 27 Jul 2015 14:22:37 +0300 From: "Michael S. Tsirkin" Message-ID: <20150727142207-mutt-send-email-mst@redhat.com> References: <1437990561-22134-1-git-send-email-jasowang@redhat.com> <1437990561-22134-4-git-send-email-jasowang@redhat.com> <55B6083B.5060603@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55B6083B.5060603@redhat.com> Subject: Re: [Qemu-devel] [PATCH V4 3/3] virtio-blk: only clear VIRTIO_F_ANY_LAYOUT for legacy device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Kevin Wolf , qemu-block@nongnu.org, Jason Wang , qemu-devel@nongnu.org, Stefan Hajnoczi , cornelia.huck@de.ibm.com On Mon, Jul 27, 2015 at 12:30:19PM +0200, Paolo Bonzini wrote: > > > On 27/07/2015 11:49, Jason Wang wrote: > > So this patch only clear VIRTIO_F_LAYOUT for legacy device. > > > > Cc: Stefan Hajnoczi > > Cc: Kevin Wolf > > Cc: qemu-block@nongnu.org > > Signed-off-by: Jason Wang > > --- > > hw/block/virtio-blk.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c > > index 9acbc3a..1d3f26c 100644 > > --- a/hw/block/virtio-blk.c > > +++ b/hw/block/virtio-blk.c > > @@ -731,7 +731,6 @@ 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_clear_feature(&features, VIRTIO_F_ANY_LAYOUT); > > if (__virtio_has_feature(features, VIRTIO_F_VERSION_1)) { > > if (s->conf.scsi) { > > error_setg(errp, "Virtio 1.0 does not support scsi passthrough!"); > > @@ -739,6 +738,7 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features, > > } > > virtio_add_feature(&features, VIRTIO_F_ANY_LAYOUT); > > } else { > > + virtio_clear_feature(&features, VIRTIO_F_ANY_LAYOUT); > > virtio_add_feature(&features, VIRTIO_BLK_F_SCSI); > > } > > This patch is unnecessary, since the feature is added back below under > "if (__virtio_has_feature(features, VIRTIO_F_VERSION_1))". > > Paolo It's needed so we can apply virtio: set any_layout in virtio core