From: Alex Williamson <alex.william...@hp.com>
Bail if the saved image requires vnet header support.
Signed-off-by: Alex Williamson <alex.william...@hp.com>
Signed-off-by: Avi Kivity <a...@redhat.com>
Signed-off-by: Anthony Liguori <aligu...@us.ibm.com>
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 2da4c47..f65ecd7 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -658,14 +658,15 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int
version_id)
if (version_id >= 6)
qemu_get_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3);
-#ifdef TAP_VNET_HDR
if (version_id == 7 && qemu_get_be32(f)) {
+#ifdef TAP_VNET_HDR
tap_using_vnet_hdr(n->vc->vlan->first_client, 1);
- }
#else
- /* FIXME: error out if nonzero? */
- qemu_get_be32(f);
+ fprintf(stderr,
+ "virtio-net: saved image requires vnet header support\n");
+ exit(1);
#endif
+ }
if (n->tx_timer_active) {
qemu_mod_timer(n->tx_timer,
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
