Commit a9dc4cf9 authored Jul 09, 2015 by Peter Maydell

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>

parents 03262486 4f4f6976

crypto/cipher-builtin.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

migration/ram.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;