From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 22 Jan 2016 14:44:12 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3c2c85ec4b112e3e2b899472314d5da6880fdf0e;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

fprintf to error_report conversion in hw/9pfs and fsdev

# gpg: Signature made Fri 22 Jan 2016 14:23:15 GMT using DSA key ID 0101DBC2
# gpg: Good signature from "Greg Kurz <gkurz@fr.ibm.com>"
# gpg:                 aka "Greg Kurz <groug@free.fr>"
# gpg:                 aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
# gpg:                 aka "Gregory Kurz (Groug) <groug@free.fr>"
# gpg:                 aka "Gregory Kurz (Cimai Technology) <gkurz@cimai.com>"
# gpg:                 aka "Gregory Kurz (Meiosys Technology) <gkurz@meiosys.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2BD4 3B44 535E C0A7 9894  DBA2 02FC 3AEB 0101 DBC2

* remotes/gkurz/tags/for-upstream:
  fsdev: use error_report() instead of fprintf(stderr)
  9pfs: use error_report() instead of fprintf(stderr)

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

3c2c85ec4b112e3e2b899472314d5da6880fdf0e