[Qemu-devel] [PULL 1.3-rc1 0/1] Net patches

[Qemu-devel] [PULL 1.3-rc1 0/1] Net patches

[Stefan Hajnoczi]

The last pull request contained the net-qom patches series which broke
NIC hotplug.  I'd like to do deeper testing and it's not critical to get
net-qom into QEMU 1.3, let's hold that back.

This pull request does contain a tap fix which is 1.3-rc1 material.

The following changes since commit 1d2a67f89abee0cef4e3d8a8dec739ef0be77120:

  Update version for 1.3.0-rc0 release (2012-11-19 13:51:39 -0600)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 58ddcd50f30cb5c020bd4f9f36b01ee160a27cac:

  tap: reset vnet header size on open (2012-11-20 15:38:37 +0100)

----------------------------------------------------------------
Michael S. Tsirkin (1):
      tap: reset vnet header size on open

 net/tap.c | 7 +++++++
 1 file changed, 7 insertions(+)

-- 
1.8.0

[Qemu-devel] [PATCH 1/1] tap: reset vnet header size on open

[Stefan Hajnoczi]

From: "Michael S. Tsirkin" <mst@redhat.com>

For tap, we currently assume the vnet header size is 10
(the default value) but that might not be the case
if tap is persistent and has been used by qemu previously.
To fix, set host header size in tap device on open.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/tap.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/net/tap.c b/net/tap.c
index df89caa..1abfd44 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -341,6 +341,13 @@ static TAPState *net_tap_fd_init(NetClientState *peer,
     s->using_vnet_hdr = 0;
     s->has_ufo = tap_probe_has_ufo(s->fd);
     tap_set_offload(&s->nc, 0, 0, 0, 0, 0);
+    /*
+     * Make sure host header length is set correctly in tap:
+     * it might have been modified by another instance of qemu.
+     */
+    if (tap_probe_vnet_hdr_len(s->fd, s->host_vnet_hdr_len)) {
+        tap_fd_set_vnet_hdr_len(s->fd, s->host_vnet_hdr_len);
+    }
     tap_read_poll(s, 1);
     s->vhost_net = NULL;
     return s;
-- 
1.8.0

Re: [Qemu-devel] [PULL 1.3-rc1 0/1] Net patches

[Anthony Liguori]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> The last pull request contained the net-qom patches series which broke
> NIC hotplug.  I'd like to do deeper testing and it's not critical to get
> net-qom into QEMU 1.3, let's hold that back.
>
> This pull request does contain a tap fix which is 1.3-rc1 material.
>
> The following changes since commit 1d2a67f89abee0cef4e3d8a8dec739ef0be77120:
>
>   Update version for 1.3.0-rc0 release (2012-11-19 13:51:39 -0600)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git net

Pulled. Thanks.

Regards,

Anthony Liguori

>
> for you to fetch changes up to 58ddcd50f30cb5c020bd4f9f36b01ee160a27cac:
>
>   tap: reset vnet header size on open (2012-11-20 15:38:37 +0100)
>
> ----------------------------------------------------------------
> Michael S. Tsirkin (1):
>       tap: reset vnet header size on open
>
>  net/tap.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> -- 
> 1.8.0