summary refs log tree commit diff stats
path: root/include/qemu/error-report.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-04-28 12:56:33 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-04-28 12:56:34 +0100
commit13de54eedd40a1b01fa7176dfb96d1c22c5cfa71 (patch)
tree6662ce703da44cec201298be591d4a263d027999 /include/qemu/error-report.h
parenta41b2c995b52b2ce26c171c52ac7dc11c7dccd99 (diff)
parent0b9f0e2fd7c5070fa06cd6bd5ec69055e3a7d2b1 (diff)
downloadfocaccia-qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.tar.gz
focaccia-qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.zip
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 'include/qemu/error-report.h')
-rw-r--r--include/qemu/error-report.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h
index 3b098a9173..000eae3957 100644
--- a/include/qemu/error-report.h
+++ b/include/qemu/error-report.h
@@ -37,7 +37,6 @@ void loc_set_file(const char *fname, int lno);
 void error_vprintf(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0);
 void error_printf(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
 void error_printf_unless_qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
-void error_print_loc(void);
 void error_set_progname(const char *argv0);
 void error_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
 const char *error_get_progname(void);