From 005d573c7f7e4d1696b4650240fc5ce2ac665fd3 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Sun, 17 May 2009 10:43:19 -0500 Subject: virtio-net: Refuse loading if the source requires vnet header and the host doesn't support it Bail if the saved image requires vnet header support. Signed-off-by: Alex Williamson Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- hw/virtio-net.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 2da4c478e..f65ecd7d1 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, -- cgit v1.2.3