From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 2 Feb 2016 15:55:01 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-next-2016-02-02... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d2ea854c382d4d080de1f149167e60290108f79b;p=qemu.git

Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-next-2016-02-02-1' into staging

Merge qcrypto-next 2016/2/2 v1

# gpg: Signature made Tue 02 Feb 2016 13:13:05 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* remotes/berrange/tags/pull-qcrypto-next-2016-02-02-1:
  crypto: ensure qcrypto_hash_digest_len is always defined
  crypto: register properties against the class instead of object
  crypto: fix description of @errp parameter initialization

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

d2ea854c382d4d080de1f149167e60290108f79b