| Message ID | 20090702122015.GA26771@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/02/2009 03:20 PM, Michael S. Tsirkin wrote: > Fix up loadvm versioning logic: vnet header should be checked for any > version>= 7, not just for version 7. > > Without this patch, migration is broken on qemu-kvm. > Note that qemu.git gets it right. > Applied, thanks.
diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 215f9d0..6b82232 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -770,7 +770,7 @@ 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); - if (version_id == 7 && qemu_get_be32(f)) { + if (version_id >= 7 && qemu_get_be32(f)) { #ifdef TAP_VNET_HDR tap_using_vnet_hdr(n->vc->vlan->first_client, 1); #else
Fix up loadvm versioning logic: vnet header should be checked for any version >= 7, not just for version 7. Without this patch, migration is broken on qemu-kvm. Note that qemu.git gets it right. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/virtio-net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)