From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEY4H-00037o-Hs for qemu-devel@nongnu.org; Mon, 13 Jul 2015 03:22:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEY4C-0005pI-Ir for qemu-devel@nongnu.org; Mon, 13 Jul 2015 03:22:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEY4C-0005pB-DP for qemu-devel@nongnu.org; Mon, 13 Jul 2015 03:22:20 -0400 Date: Mon, 13 Jul 2015 10:22:17 +0300 From: "Michael S. Tsirkin" Message-ID: <20150713102133-mutt-send-email-mst@redhat.com> References: <1436766411-29144-1-git-send-email-jasowang@redhat.com> <1436766411-29144-4-git-send-email-jasowang@redhat.com> <20150713081617.2898650f.cornelia.huck@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150713081617.2898650f.cornelia.huck@de.ibm.com> Subject: Re: [Qemu-devel] [PATCH 4/5] Revert "virtio-net: enable virtio 1.0" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: Jason Wang , qemu-devel@nongnu.org On Mon, Jul 13, 2015 at 08:16:17AM +0200, Cornelia Huck wrote: > On Mon, 13 Jul 2015 13:46:50 +0800 > Jason Wang wrote: > > > This reverts commit df91055db5c9cee93d70ca8c08d72119a240b987. > > > > This is because: > > - vhost support virtio 1.0 now > > - transport code (e.g virtio-pci) set this feature when modern is > > enabled, setting this unconditionally will break disable-modern=on. > > *scratches head* > > Why is transport code now supposed to set VERSION_1? I thought we > wanted to have the individual devices offer it, once they are converted. Because all devices have been converted now. Excepting bugs, but we can fix these. > No objection on removing the dependency on !vhost. > > > > > Cc: Cornelia Huck > > Signed-off-by: Jason Wang > > --- > > hw/net/virtio-net.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > > index d728233..e3c2db3 100644 > > --- a/hw/net/virtio-net.c > > +++ b/hw/net/virtio-net.c > > @@ -466,7 +466,6 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features) > > } > > > > if (!get_vhost_net(nc->peer)) { > > - virtio_add_feature(&features, VIRTIO_F_VERSION_1); > > return features; > > } > > return vhost_net_get_features(get_vhost_net(nc->peer), features);