diff options
| author |   Alex Williamson <alex.williamson@hp.com> | 2009-05-17 10:43:18 -0500 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-05-21 12:05:12 +0300 |
| commit | f59ce0d4d0be98190d45e6389f32c39f0571ead9 (patch) | |
| tree | 55201ca75ff86db7d1b137f85eb5eb64da360cdd | |
| parent | 48afa7bddb33a92d6686afa9ea7cb421fb2121f0 (diff) | |
virtio-net: Make save/load format independent of build options
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>
| -rw-r--r-- | hw/virtio-net.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 27620ba95..2da4c478e 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) { |