From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Fri, 28 Mar 2025 12:06:33 +0000 (-0400)
Subject: Merge tag 'migration-20250327-pull-request' of https://gitlab.com/farosas/qemu into... 
X-Git-Tag: v10.0.0-rc2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5300db9fa11c4f84e532502a97463efaaf45a19;p=thirdparty%2Fqemu.git

Merge tag 'migration-20250327-pull-request' of https://gitlab.com/farosas/qemu into staging

Migration pull request

Fix crash due to cpr migration blocker (affects SEV-SNP guest)

# -----BEGIN PGP SIGNATURE-----
#
# iQJEBAABCAAuFiEEqhtIsKIjJqWkw2TPx5jcdBvsMZ0FAmflnA4QHGZhcm9zYXNA
# c3VzZS5kZQAKCRDHmNx0G+wxnToTEACblWuLFBjnjJNZoW1f4LT27cT8s98huolA
# audigd4xqYQEya1VTiyYckeJKeGp/aC7A4YkjrsFNCwknmIpzqGh4bhRdezerM16
# hlv/mfD9GGDYBS5jMXs8pMo442Lpn7/q78UUflfZwi+ad+XE4xdHkbh0i/GYuuj/
# Z4E2F62tboUfJ0RGeDcV/xjiaxnWkru2x9fMX5BCEez2Jj0Axk80W2lcfcu6tZL4
# s/uEmc235B5f6JtoIVdnr4IllenaukzBt+vPSD+QwweiPwLDTZ+IjBk/Q8Dh4jb8
# Q6E1Paf7ZfeHRlRM1XqZgRACPBQ/gTeCslbCDxjQgCfiS4dL70rdbTSpWOQyYUc3
# DYtqGnJO6t0dHFcH2m2envYT5u5cN+S80yVU+hA4LjefJ1cCu2IWiHwMF5EIYfO4
# eE9CNPALW09mi8OkPNsXRiplLZekIjQPV7znmLh82GWWaTa2GpJYZhD5jhUmyRex
# jvdrsLBK1dLgv5PjMMhO6cQobgZQaxbzHMGW+IvobEZ2jjGCNTCZ2/YfXQOGcPcs
# pN5Q+8U5IvmhVCTiN7kVRL6TThwT2KqAdWA/UXi5lLQiTHTrEEVJip6JWLJs4zmf
# q3g9VIhr8x7Room6TKex6pkeO/7OqSik/pjOvjVCE6RGfi6yNd9a3KLfvCePDjdN
# kLWoyan8eQ==
# =fZ+v
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 27 Mar 2025 14:42:22 EDT
# gpg:                using RSA key AA1B48B0A22326A5A4C364CFC798DC741BEC319D
# gpg:                issuer "farosas@suse.de"
# gpg: Good signature from "Fabiano Rosas <farosas@suse.de>" [unknown]
# gpg:                 aka "Fabiano Almeida Rosas <fabiano.rosas@suse.com>" [unknown]
# gpg: WARNING: The key's User ID is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: AA1B 48B0 A223 26A5 A4C3  64CF C798 DC74 1BEC 319D

* tag 'migration-20250327-pull-request' of https://gitlab.com/farosas/qemu:
  migration: Avoid SNP guest crash due to duplicate cpr blocker

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

f5300db9fa11c4f84e532502a97463efaaf45a19