mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
Fixes for two bad bugs. For 2.4-rc0.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJVnosbAAoJEL/70l94x66DNAIH/A+CeUPABxtDYJzO7ih33jqg NiTczWfc3LWac/CldeEkF4KX6TA7S671TTJgPcXdwsEtNK4Ao8YMhCHboFvRl2br Ie1k6CzuMwaqg0ugNlSrAY0G4e7e6IEaW0PK5DRWriG+0W9JiTGrBkCnrbNLxGxX Im8BaDlfz38/xSGlJbgoc20OpuOoz6T1HDi2WSQmyQuuYCvmXYa6aiattfOY12F8 NSWQX72uehBM2S0g2tlZXn0fdARf8nMYOIBEtV4Xg522R+MEhPTVX+dbr8ecxosY rkovUz8DSTW/J7xt1MbjkyUlfQKwIqEVjARp1a/5tfpV9nz52uFqraY4QXDyJtA= =BNDR -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging Fixes for two bad bugs. For 2.4-rc0. # gpg: Signature made Thu Jul 9 15:54:19 2015 BST using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # 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: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: crypto: fix builtin qcrypto_cipher_free migration: fix RCU deadlock Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
a9dc4cf94c
|
@ -354,11 +354,13 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
|
|||
|
||||
void qcrypto_cipher_free(QCryptoCipher *cipher)
|
||||
{
|
||||
QCryptoCipherBuiltin *ctxt = cipher->opaque;
|
||||
QCryptoCipherBuiltin *ctxt;
|
||||
|
||||
if (!cipher) {
|
||||
return;
|
||||
}
|
||||
|
||||
ctxt = cipher->opaque;
|
||||
ctxt->free(cipher);
|
||||
g_free(cipher);
|
||||
}
|
||||
|
|
|
@ -1266,9 +1266,10 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
|
|||
|
||||
flush_compressed_data(f);
|
||||
ram_control_after_iterate(f, RAM_CONTROL_FINISH);
|
||||
migration_end();
|
||||
|
||||
rcu_read_unlock();
|
||||
|
||||
migration_end();
|
||||
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue