diff options
| author | Peter Maydell | 2014-04-28 13:56:33 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-04-28 13:56:34 +0200 |
| commit | 13de54eedd40a1b01fa7176dfb96d1c22c5cfa71 (patch) | |
| tree | 6662ce703da44cec201298be591d4a263d027999 /util/error.c | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | monitor: fix qmp_getfd() fd leak in error case (diff) | |
| download | qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.tar.gz qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.tar.xz 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 'util/error.c')
| -rw-r--r-- | util/error.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/util/error.c b/util/error.c index f11f1d57a0..2bb42e1c4b 100644 --- a/util/error.c +++ b/util/error.c @@ -12,10 +12,7 @@ #include "qemu-common.h" #include "qapi/error.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qdict.h" -#include "qapi-types.h" -#include "qapi/qmp/qerror.h" +#include "qemu/error-report.h" struct Error { |