Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-11-11' into staging
commitc459343b8552e65398a05581f7ff31a068b5b551
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 12 Nov 2015 10:09:14 +0000 (12 10:09 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 12 Nov 2015 10:09:14 +0000 (12 10:09 +0000)
treee50ac07694ead2bb1b67459054004206b37521fe
parent7497b8dddcaee5b5f1851434607d0de044012ebe
parent455b0fde8c38a0794743e2e7c1a40018b7bee9f6
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-11-11' into staging

error: More error_setg() usage

# gpg: Signature made Wed 11 Nov 2015 17:57:15 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-error-2015-11-11:
  error: More error_setg() usage

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