From: Alex Williamson <[email protected]> Bail if the saved image requires vnet header support.
Signed-off-by: Alex Williamson <[email protected]> Signed-off-by: Avi Kivity <[email protected]> diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 6dfe758..4beb16d 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -663,14 +663,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, -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
