From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJffy-00061R-6c for qemu-devel@nongnu.org; Mon, 27 Jul 2015 06:30:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJffx-0001zJ-Be for qemu-devel@nongnu.org; Mon, 27 Jul 2015 06:30:30 -0400 References: <1437990561-22134-1-git-send-email-jasowang@redhat.com> <1437990561-22134-4-git-send-email-jasowang@redhat.com> From: Paolo Bonzini Message-ID: <55B6083B.5060603@redhat.com> Date: Mon, 27 Jul 2015 12:30:19 +0200 MIME-Version: 1.0 In-Reply-To: <1437990561-22134-4-git-send-email-jasowang@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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: Jason Wang , qemu-devel@nongnu.org Cc: cornelia.huck@de.ibm.com, Kevin Wolf , qemu-block@nongnu.org, Stefan Hajnoczi , mst@redhat.com 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