]> git.proxmox.com Git - mirror_qemu.git/commit
slirp: Fix migration from older versions of QEMU to the current one
authorThomas Huth <thuth@redhat.com>
Thu, 31 Mar 2016 14:48:41 +0000 (16:48 +0200)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Thu, 31 Mar 2016 22:05:06 +0000 (00:05 +0200)
commiteaf136f9a21e02a2f55346e44d2d88df37b2cde3
tree0d867a2d94010750fd3744b41c9a6f0ba169f0d7
parent57528a3fef2fd65661320723ad8c3c781f4fd49f
slirp: Fix migration from older versions of QEMU to the current one

While adding the IPv6 support, the commit eae303ff23f51259eddc8856c71453d8
("slirp: Make Socket structure IPv6 compatible") changed the format of
the migration stream, without taking into account that we might still
receive an old migration stream layout when upgrading from QEMU version
2.5 (or older) to QEMU 2.6. Currently, QEMU bails out when doing a
migration from QEMU 2.5 to the recent master version when it has
been started with a "-net user,guestfwd=..." network. So let's fix
this by checking the version ID of the migration stream and by using
the old behavior if we've detected version 3 or less.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
slirp/slirp.c