All of
 help / color / mirror / Atom feed
From: Mark McLoughlin <>
To: Avi Kivity <>
Subject: Re: [PATCH 1/1] kvm: qemu: virtio-net: migration fixes
Date: Wed, 07 Jan 2009 10:23:40 +0000	[thread overview]
Message-ID: <1231323820.5050.10.camel@localhost.localdomain> (raw)
In-Reply-To: <>

Hi Avi,

A new version, with Anthony's suggested savevm version number bump.


From: Mark McLoughlin <>
Subject: [PATCH] kvm: qemu: virtio-net: migration fixes

We were failing to save two important pieces of state:

  1) Whether the guest will supply us rx buffers using the
     new mergeable format; this caused the migrated guest
     to crash with "virtio-net header not in first element"

  2) Whether the tx/rx buffers we exchange with the tap
     code should include a virtio_net_hdr header; this
     caused the migrated guest to receive garbage packets
     because the tap code was stripping away the header
     and virtio_net was interpreting packet data as the
     virtio_net header

With these fixes a guest using mergeable rx buffers and
GSO passes a simple "ping while migrating" test.

Bump the savevm version number and refuse to load v1 saves
just to be on the safe side.

Signed-off-by: Mark McLoughlin <>
 qemu/hw/virtio-net.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/virtio-net.c b/qemu/hw/virtio-net.c
index ef8f591..dfe370a 100644
--- a/qemu/hw/virtio-net.c
+++ b/qemu/hw/virtio-net.c
@@ -360,19 +360,30 @@ static void virtio_net_save(QEMUFile *f, void *opaque)
     qemu_put_buffer(f, n->mac, 6);
     qemu_put_be32(f, n->tx_timer_active);
+    qemu_put_be32(f, n->mergeable_rx_bufs);
+#ifdef TAP_VNET_HDR
+    qemu_put_be32(f, tap_has_vnet_hdr(n->vc->vlan->first_client));
 static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
     VirtIONet *n = opaque;
-    if (version_id != 1)
+    if (version_id != 2)
         return -EINVAL;
     virtio_load(&n->vdev, f);
     qemu_get_buffer(f, n->mac, 6);
     n->tx_timer_active = qemu_get_be32(f);
+    n->mergeable_rx_bufs = qemu_get_be32(f);
+#ifdef TAP_VNET_HDR
+    if (qemu_get_be32(f))
+      tap_using_vnet_hdr(n->vc->vlan->first_client, 1);
     if (n->tx_timer_active) {
@@ -407,7 +418,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
     n->tx_timer_active = 0;
     n->mergeable_rx_bufs = 0;
-    register_savevm("virtio-net", virtio_net_id++, 1,
+    register_savevm("virtio-net", virtio_net_id++, 2,
                     virtio_net_save, virtio_net_load, n);
     return (PCIDevice *)n;

  reply	other threads:[~2009-01-07 10:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-06 11:48 [PATCH 1/1] kvm: qemu: virtio-net: migration fixes Mark McLoughlin
2009-01-07 10:23 ` Mark McLoughlin [this message]
2009-01-08 14:11   ` Avi Kivity
2009-01-11 15:50   ` Avi Kivity
2009-01-11 15:51     ` Avi Kivity

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:

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

  git send-email \
    --in-reply-to=1231323820.5050.10.camel@localhost.localdomain \ \ \ \

* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.