From: Peter Maydell Date: Tue, 28 Jul 2015 13:19:16 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging X-Git-Tag: qemu-xen-4.7.0-rc1~135 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5e868d2e5e4aff76bdef787e44bc2d1eca18901f;p=qemu-xen.git Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * crypto fixes * megasas SIGSEGV fix * memory refcount change to fix virtio hot-unplug # gpg: Signature made Tue Jul 28 08:29:07 2015 BST using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini " # gpg: aka "Paolo Bonzini " # 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: memory: do not add a reference to the owner of aliased regions megasas: Add write function to handle write access to PCI BAR 3 crypto: extend unit tests to cover decryption too crypto: fix built-in AES decrypt function Signed-off-by: Peter Maydell --- 5e868d2e5e4aff76bdef787e44bc2d1eca18901f