From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LKAMb-0000rU-KX for qemu-devel@nongnu.org; Tue, 06 Jan 2009 06:44:49 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LKAMX-0000pV-7g for qemu-devel@nongnu.org; Tue, 06 Jan 2009 06:44:47 -0500 Received: from [199.232.76.173] (port=35944 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LKAMW-0000pA-1a for qemu-devel@nongnu.org; Tue, 06 Jan 2009 06:44:44 -0500 Received: from mail13.svc.cra.dublin.eircom.net ([159.134.118.29]:44860) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1LKAMV-0003WV-Js for qemu-devel@nongnu.org; Tue, 06 Jan 2009 06:44:43 -0500 From: Mark McLoughlin Date: Tue, 6 Jan 2009 11:44:41 +0000 Message-Id: <1231242281-2597-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH] virtio-net migration fix Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Mark McLoughlin , qemu-devel@nongnu.org We are failing to save whether the guest will supply us rx buffers using the new mergeable format; this can cause a migrated guest to crash with: virtio-net header not in first element Signed-off-by: Mark McLoughlin --- hw/virtio-net.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 1f45b2d..66d43d9 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -275,6 +275,7 @@ 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); } static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) @@ -288,6 +289,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, n->mac, 6); n->tx_timer_active = qemu_get_be32(f); + n->mergeable_rx_bufs = qemu_get_be32(f); if (n->tx_timer_active) { qemu_mod_timer(n->tx_timer, -- 1.6.0.6