From: Peter Maydell Date: Tue, 23 Jun 2015 09:38:00 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-06-22' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~101 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3206972a9eab65ec8e8f9ae320ad628ba4b58f1;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-06-22' into staging Monitor patches # gpg: Signature made Mon Jun 22 18:56:18 2015 BST using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-monitor-2015-06-22: (24 commits) Include monitor/monitor.h exactly where needed Include qapi/qmp/qerror.h exactly where needed qerror: Move #include out of qerror.h qerror: Finally unused, clean up qmp: Wean off qerror_report() tpm: Avoid qerror_report() outside QMP command handlers qerror: Clean up QERR_ macros to expand into a single string qerror: Eliminate QERR_DEVICE_NOT_FOUND vl: Use error_report() for --display errors vl: Avoid qerror_report() outside QMP command handlers QemuOpts: Wean off qerror_report_err() qdev-monitor: Propagate errors through qdev_device_add() qdev-monitor: Propagate errors through set_property() qdev-monitor: Convert qbus_find() to Error qdev-monitor: Fix check for full bus qdev-monitor: Stop error avalanche in qbus_find_recursive() disas: Remove uses of CPU env monitor: Split mon_get_cpu fn to remove ENV_GET_CPU monitor: Fix failure path for "S" argument monitor: Point to "help" command on syntax error ... Signed-off-by: Peter Maydell --- a3206972a9eab65ec8e8f9ae320ad628ba4b58f1