public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Cornelia Huck <cornelia.huck@de.ibm.com>
To: virtualization@lists.linux-foundation.org, qemu-devel@nongnu.org,
	kvm@vger.kernel.org
Cc: rusty@rustcorp.com.au, thuth@linux.vnet.ibm.com, mst@redhat.com,
	Cornelia Huck <cornelia.huck@de.ibm.com>
Subject: [PATCH RFC v4 16/16] virtio-net: enable virtio 1.0
Date: Thu, 27 Nov 2014 16:16:49 +0100	[thread overview]
Message-ID: <1417101409-29482-17-git-send-email-cornelia.huck@de.ibm.com> (raw)
In-Reply-To: <1417101409-29482-1-git-send-email-cornelia.huck@de.ibm.com>

virtio-net (non-vhost) now should have everything in place to support
virtio 1.0: let's enable the feature bit for it.

Note that VIRTIO_F_VERSION_1 is technically a transport feature; once
every device is ready for virtio 1.0, we can move setting this
feature bit out of the individual devices.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 hw/net/virtio-net.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index b31b3a4..9ceff02 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -453,6 +453,10 @@ static uint32_t virtio_net_get_features(VirtIODevice *vdev, unsigned int index,
     VirtIONet *n = VIRTIO_NET(vdev);
     NetClientState *nc = qemu_get_queue(n->nic);
 
+    if (index == 1 && !get_vhost_net(nc->peer)) {
+        features |= (1 << (VIRTIO_F_VERSION_1 - 32));
+    }
+
     if (index > 0) {
         return features;
     }
-- 
1.7.9.5


  parent reply	other threads:[~2014-11-27 15:17 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-27 15:16 [PATCH RFC v4 00/16] qemu: towards virtio-1 host support Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 01/16] linux-headers/virtio_config: Update with VIRTIO_F_VERSION_1 Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 02/16] virtio: cull virtio_bus_set_vdev_features Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 03/16] virtio: support more feature bits Cornelia Huck
2014-11-27 15:34   ` Michael S. Tsirkin
2014-11-27 15:40     ` Cornelia Huck
2014-11-27 15:44       ` Michael S. Tsirkin
2014-11-27 15:16 ` [PATCH RFC v4 04/16] s390x/virtio-ccw: fix check for WRITE_FEAT Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 05/16] virtio: introduce legacy virtio devices Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 06/16] virtio: allow virtio-1 queue layout Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 07/16] dataplane: allow virtio-1 devices Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 08/16] s390x/css: Add a callback for when subchannel gets disabled Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 09/16] s390x/virtio-ccw: add virtio set-revision call Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 10/16] s390x/virtio-ccw: support virtio-1 set_vq format Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 11/16] virtio: disallow late feature changes for virtio-1 Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 12/16] virtio: allow to fail setting status Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 13/16] s390x/virtio-ccw: enable virtio 1.0 Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 14/16] virtio-net: no writeable mac for virtio-1 Cornelia Huck
2014-11-27 15:16 ` [PATCH RFC v4 15/16] virtio-net: support longer header Cornelia Huck
2014-11-27 15:16 ` Cornelia Huck [this message]
2014-11-27 15:24 ` [PATCH RFC v4 00/16] qemu: towards virtio-1 host support Michael S. Tsirkin
2014-11-27 15:31   ` Cornelia Huck
2014-11-27 15:42     ` Michael S. Tsirkin
2014-11-27 16:06       ` Cornelia Huck
2014-11-27 16:18         ` Michael S. Tsirkin
2014-11-27 16:28           ` Cornelia Huck
2014-11-27 16:35             ` Michael S. Tsirkin
2014-11-28  9:47               ` Cornelia Huck
2014-11-27 16:38             ` Michael S. Tsirkin
2014-11-28  9:50               ` Cornelia Huck
2015-02-25  4:20 ` Qemu and virtio 1.0 Rusty Russell
2015-02-25 11:26   ` Cornelia Huck
2015-03-02 11:43   ` Michael S. Tsirkin
2015-03-02 12:00     ` Cornelia Huck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1417101409-29482-17-git-send-email-cornelia.huck@de.ibm.com \
    --to=cornelia.huck@de.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rusty@rustcorp.com.au \
    --cc=thuth@linux.vnet.ibm.com \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox