[PATCH 16/17] virtio-net: Make save/load format independent of build options

From: Anthony Liguori <aliguori@us.ibm.com>
To: kvm@vger.kernel.org
Cc: Glauber Costa <glommer@gmail.com>,
	Alex Williamson <alex.williamson@hp.com>,
	Avi Kivity <avi@redhat.com>,
	Anthony Liguori <aliguori@us.ibm.com>
Subject: [PATCH 16/17] virtio-net: Make save/load format independent of build options
Date: Sun, 17 May 2009 10:43:18 -0500	[thread overview]
Message-ID: <1242574999-20887-18-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1242574999-20887-1-git-send-email-aliguori@us.ibm.com>

From: Alex Williamson <alex.williamson@hp.com>

We can't rely on build switches to tell us if a save image
includes a given field.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 27620ba..2da4c47 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -616,6 +616,8 @@ static void virtio_net_save(QEMUFile *f, void *opaque)
 
 #ifdef TAP_VNET_HDR
     qemu_put_be32(f, tap_has_vnet_hdr(n->vc->vlan->first_client));
+#else
+    qemu_put_be32(f, 0);
 #endif
 }
 
@@ -660,6 +662,9 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
     if (version_id == 7 && qemu_get_be32(f)) {
         tap_using_vnet_hdr(n->vc->vlan->first_client, 1);
     }
+#else
+    /* FIXME: error out if nonzero? */
+    qemu_get_be32(f);
 #endif
 
     if (n->tx_timer_active) {
-- 
1.6.0.6

