]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Feb 2015 07:01:08 +0000 (07:01 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Feb 2015 07:01:08 +0000 (07:01 +0000)
commitc5c6d7f81a6950d8e32a3b5a0bafd37bfa5a8e88
tree792ffe6fdc9cfdc48c25f2da39b3a6877576eb16
parent68b459eaa660be17d3547aa581502fe2c572c84f
parent33394884060b6501ef39b124eeaa111f61c59f7f
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>
13 files changed:
arch_init.c
block/sheepdog.c
blockdev.c
hw/pci/pci-hotplug-old.c
hw/scsi/vhost-scsi.c
hw/usb/dev-network.c
hw/usb/host-libusb.c
monitor.c
net/net.c
qemu-img.c
qemu-io.c
qemu-nbd.c
vl.c