public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Mark McLoughlin <markmc@redhat.com>
To: Avi Kivity <avi@qumranet.com>
Cc: kvm@vger.kernel.org, Mark McLoughlin <markmc@redhat.com>
Subject: [PATCH 10/12] kvm: qemu: Add a -net tap,fd=X,vnet_hdr=on option
Date: Mon, 11 Aug 2008 21:12:13 +0100	[thread overview]
Message-ID: <1218485535-877-11-git-send-email-markmc@redhat.com> (raw)
In-Reply-To: <1218485535-877-10-git-send-email-markmc@redhat.com>

Some management apps like libvirt creates a tap interface,
adds it to a bridge and then passes the fd to qemu-kvm.

Since we have no way of querying whether the IFF_VNET_HDR
flag has been enabled on the interface, the app needs to
tell us if has enabled it.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 qemu/vl.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/qemu/vl.c b/qemu/vl.c
index 14a66e0..499d6f9 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -5487,10 +5487,19 @@ int net_client_init(const char *device, const char *p)
         int fd;
         vlan->nb_host_devs++;
         if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
+            int vnet_hdr = 0;
             fd = strtol(buf, NULL, 0);
             fcntl(fd, F_SETFL, O_NONBLOCK);
+            if (get_param_value(buf, sizeof(buf), "vnet_hdr", p) > 0) {
+                if (strcmp(buf, "on") == 0) {
+                    vnet_hdr = 1;
+                } else if (strcmp(buf, "off") != 0) {
+                    fprintf(stderr, "qemu: '%s' invalid vnet_hdr option\n", buf);
+                    return 0;
+                }
+            }
             ret = -1;
-            if (net_tap_fd_init(vlan, fd, 0))
+            if (net_tap_fd_init(vlan, fd, vnet_hdr))
                 ret = 0;
         } else {
             if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
-- 
1.5.4.1


  reply	other threads:[~2008-08-11 20:12 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-11 20:12 [PATCH 0/12] virtio_net perf patches Mark McLoughlin
2008-08-11 20:12 ` [PATCH 01/12] kvm: qemu: Fix virtio_net tx timer Mark McLoughlin
2008-08-11 20:12   ` [PATCH 02/12] kvm: qemu: Remove virtio_net tx ring-full heuristic Mark McLoughlin
2008-08-11 20:12     ` [PATCH 03/12] kvm: qemu: Add VIRTIO_F_NOTIFY_ON_EMPTY Mark McLoughlin
2008-08-11 20:12       ` [PATCH 04/12] kvm: qemu: Disable recv notifications until avail buffers exhausted Mark McLoughlin
2008-08-11 20:12         ` [PATCH 05/12] kvm: qemu: Add support for partial csums and GSO Mark McLoughlin
2008-08-11 20:12           ` [PATCH 06/12] kvm: qemu: Rename tap_readv() to tap_receive_iov() Mark McLoughlin
2008-08-11 20:12             ` [PATCH 07/12] kvm: qemu: Move some code around for the next commit Mark McLoughlin
2008-08-11 20:12               ` [PATCH 08/12] kvm: qemu: Don't require all drivers to use virtio_net_hdr Mark McLoughlin
2008-08-11 20:12                 ` [PATCH 09/12] kvm: qemu: Actually enable GSO support Mark McLoughlin
2008-08-11 20:12                   ` Mark McLoughlin [this message]
2008-08-11 20:12                     ` [PATCH 11/12] kvm: qemu: Increase size of virtio_net rings Mark McLoughlin
2008-08-11 20:12                       ` [PATCH 12/12] kvm: qemu: Drop the mutex while reading from tapfd Mark McLoughlin
2008-08-11 20:30                     ` [PATCH 10/12] kvm: qemu: Add a -net tap,fd=X,vnet_hdr=on option Anthony Liguori
2008-08-12 17:41                 ` [PATCH 08/12] kvm: qemu: Don't require all drivers to use virtio_net_hdr Mark McLoughlin
2008-08-13  9:13                   ` Avi Kivity
2008-08-11 20:30 ` [PATCH 0/12] virtio_net perf patches Anthony Liguori
2008-08-12 18:12   ` Mark McLoughlin
2008-08-12 18:28     ` Anthony Liguori
2008-08-12 23:39     ` Herbert Xu
2008-08-12 13:51 ` Avi Kivity
2008-08-12 14:55   ` Avi Kivity
2008-08-13 14:39   ` [PATCH 1/1] kvm: qemu: Handle tap fds with IFF_VNET_HDR Mark McLoughlin
2008-08-13 16:24     ` Avi Kivity
2008-08-13 16:28       ` Daniel P. Berrange
2008-08-20 17:04       ` [PATCH] " Mark McLoughlin
2008-08-20 17:09         ` Mark McLoughlin
2008-08-20 17:27           ` Avi Kivity
2008-08-20 17:49         ` Anthony Liguori
2008-08-20 17:51           ` Avi Kivity
2008-08-20 18:01             ` Anthony Liguori
2008-08-21  9:30             ` Mark McLoughlin
2008-08-21 13:55               ` Avi Kivity
2008-08-21 13:58                 ` Anthony Liguori
2008-08-20 18:11           ` Daniel P. Berrange

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=1218485535-877-11-git-send-email-markmc@redhat.com \
    --to=markmc@redhat.com \
    --cc=avi@qumranet.com \
    --cc=kvm@vger.kernel.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