[Qemu-commits] [qemu/qemu] eaf136: slirp: Fix migration from older versions of QEMU t...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: eaf136f9a21e02a2f55346e44d2d88df37b2cde3
      
https://github.com/qemu/qemu/commit/eaf136f9a21e02a2f55346e44d2d88df37b2cde3
  Author: Thomas Huth <address@hidden>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M slirp/slirp.c

  Log Message:
  -----------
  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 <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: de1d099a448beb2ec39af4bd9ce4dd6452a18cb5
      
https://github.com/qemu/qemu/commit/de1d099a448beb2ec39af4bd9ce4dd6452a18cb5
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M slirp/slirp.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into 
staging

slirp updates (2)

# gpg: Signature made Thu 31 Mar 2016 23:19:08 BST using RSA key ID FB6B2F1D
# gpg: Good signature from "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: F632 74CD C630 0873 CB3D  29D9 E3E5 1CE8 FB6B 2F1D

* remotes/thibault/tags/samuel-thibault-2:
  slirp: Fix migration from older versions of QEMU to the current one

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/57528a3fef2f...de1d099a448b