Re: [Qemu-devel] [PATCH 4/5] Revert "virtio-net: enable virtio 1.0"

[Michael S. Tsirkin]

On Mon, Jul 13, 2015 at 08:16:17AM +0200, Cornelia Huck wrote:
> On Mon, 13 Jul 2015 13:46:50 +0800
> Jason Wang <address@hidden> 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 <address@hidden>
> > Signed-off-by: Jason Wang <address@hidden>
> > ---
> >  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);