Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0ZOE-0006mU-1O for qemu-devel@nongnu.org; Wed, 21 Oct 2009 07:30:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0ZO6-0006hE-AJ for qemu-devel@nongnu.org; Wed, 21 Oct 2009 07:29:59 -0400 Received: from [199.232.76.173] (port=57340 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0ZO3-0006fE-PJ for qemu-devel@nongnu.org; Wed, 21 Oct 2009 07:29:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52684) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0ZO3-0002xw-5f for qemu-devel@nongnu.org; Wed, 21 Oct 2009 07:29:51 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9LBToeH019660 for ; Wed, 21 Oct 2009 07:29:50 -0400 From: Mark McLoughlin Date: Wed, 21 Oct 2009 12:27:58 +0100 Message-Id: <1256124478-2988-20-git-send-email-markmc@redhat.com> In-Reply-To: <1256124478-2988-1-git-send-email-markmc@redhat.com> References: <1256124478-2988-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 19/19] virtio-net: add tap_has_ufo flag to saved state List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mark McLoughlin If we tell the guest we support UFO and then migrate to host which doesn't support it, we will find ourselves in grave difficulties. Prevent this scenario by adding a flag to virtio-net's savevm format which indicates whether the device requires host UFO support. Signed-off-by: Mark McLoughlin --- hw/virtio-net.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 3349800..f919952 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -16,7 +16,7 @@ #include "qemu-timer.h" #include "virtio-net.h" -#define VIRTIO_NET_VM_VERSION 10 +#define VIRTIO_NET_VM_VERSION 11 #define MAC_TABLE_ENTRIES 64 #define MAX_VLAN (1 << 12) /* Per 802.1Q definition */ @@ -694,6 +694,7 @@ static void virtio_net_save(QEMUFile *f, void *opaque) qemu_put_byte(f, n->nomulti); qemu_put_byte(f, n->nouni); qemu_put_byte(f, n->nobcast); + qemu_put_byte(f, peer_has_vnet_hdr(n) && tap_has_ufo(n->vc->peer)); } static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) @@ -769,6 +770,15 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) n->nobcast = qemu_get_byte(f); } + if (version_id >= 11) { + if (qemu_get_byte(f) && + (!peer_has_vnet_hdr(n) || !tap_has_ufo(n->vc->peer))) { + fprintf(stderr, + "virtio-net: saved image requires TUN_F_UFO support\n"); + return -1; + } + } + /* Find the first multicast entry in the saved MAC filter */ for (i = 0; i < n->mac_table.in_use; i++) { if (n->mac_table.macs[i * ETH_ALEN] & 1) { -- 1.6.2.5