diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-28 12:56:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-28 12:56:34 +0100 |
| commit | 13de54eedd40a1b01fa7176dfb96d1c22c5cfa71 (patch) | |
| tree | 6662ce703da44cec201298be591d4a263d027999 /util/qemu-error.c | |
| parent | a41b2c995b52b2ce26c171c52ac7dc11c7dccd99 (diff) | |
| parent | 0b9f0e2fd7c5070fa06cd6bd5ec69055e3a7d2b1 (diff) | |
| download | qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.zip qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.tar.gz qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.tar.bz2 | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
monitor: fix qmp_getfd() fd leak in error case
HMP: support specifying dump format for dump-guest-memory
HMP: fix doc of dump-guest-memory
qmp: object-add: Validate class before creating object
monitor: Add device_add and device_del completion.
monitor: Add command_completion callback to mon_cmd_t.
monitor: Fix drive_del id argument type completion.
error: Remove some unused headers
qerror.h: Replace QERR_NOT_SUPPORTED with QERR_UNSUPPORTED
qerror.h: Remove QERR defines that are only used once
qerror.h: Remove unused error classes
error: Print error_report() to stderr if using qmp
monitor: Remove unused monitor_print_filename
error: Privatize error_print_loc
vnc: Remove default_mon usage
slirp: Remove default_mon usage
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-error.c')
| -rw-r--r-- | util/qemu-error.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/qemu-error.c b/util/qemu-error.c index fec02c6..7b167fd 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -20,7 +20,7 @@ */ void error_vprintf(const char *fmt, va_list ap) { - if (cur_mon) { + if (cur_mon && !monitor_cur_is_qmp()) { monitor_vprintf(cur_mon, fmt, ap); } else { vfprintf(stderr, fmt, ap); @@ -165,7 +165,7 @@ const char *error_get_progname(void) /* * Print current location to current monitor if we have one, else to stderr. */ -void error_print_loc(void) +static void error_print_loc(void) { const char *sep = ""; int i; |