Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging

Clean up around error_get_pretty(), qerror_report_err()

# gpg: Signature made Wed Feb 18 10:10:07 2015 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-02-18:
  qemu-char: Avoid qerror_report_err() outside QMP command handlers
  qemu-img: Avoid qerror_report_err() outside QMP command handlers
  vl: Avoid qerror_report_err() outside QMP command handlers
  tpm: Avoid qerror_report_err() outside QMP command handlers
  numa: Avoid qerror_report_err() outside QMP command handlers
  net: Avoid qerror_report_err() outside QMP command handlers
  monitor: Avoid qerror_report_err() outside QMP command handlers
  monitor: Clean up around monitor_handle_fd_param()
  error: Use error_report_err() where appropriate
  error: New convenience function error_report_err()
  vhost-scsi: Improve error reporting for invalid vhostfd

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

diff --cc arch_init.c
Simple merge

diff --cc block/sheepdog.c
Simple merge

diff --cc blockdev.c
Simple merge

diff --cc hw/pci/pci-hotplug-old.c
Simple merge

diff --cc hw/scsi/vhost-scsi.c
Simple merge

diff --cc hw/usb/dev-network.c
Simple merge

diff --cc hw/usb/host-libusb.c
Simple merge

diff --cc monitor.c
Simple merge

diff --cc net/net.c
Simple merge

diff --cc qemu-img.c
Simple merge

diff --cc qemu-io.c
Simple merge

diff --cc qemu-nbd.c
Simple merge

diff --cc vl.c
Simple merge