From: Peter Maydell Date: Thu, 26 Feb 2015 07:01:08 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c5c6d7f81a6950d8e32a3b5a0bafd37bfa5a8e88;p=qemu.git 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 " # gpg: aka "Markus Armbruster " * 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 --- c5c6d7f81a6950d8e32a3b5a0bafd37bfa5a8e88