[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macr
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro |
Date: |
Thu, 5 Feb 2015 08:36:20 +0100 |
The QERR_ macros are leftovers from the days of "rich" error objects.
They're used with error_set() and qerror_report(), and expand into the
first *two* arguments. This trickiness has become pointless. Clean
this one up.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/qapi/qmp/qerror.h | 3 ---
monitor.c | 3 ++-
qapi/qmp-dispatch.c | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 0ca6cbd..28f980e 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -52,9 +52,6 @@ void qerror_report_err(Error *err);
#define QERR_BUS_NOT_FOUND \
ERROR_CLASS_GENERIC_ERROR, "Bus '%s' not found"
-#define QERR_COMMAND_NOT_FOUND \
- ERROR_CLASS_COMMAND_NOT_FOUND, "The command %s has not been found"
-
#define QERR_DEVICE_ENCRYPTED \
ERROR_CLASS_DEVICE_ENCRYPTED, "'%s' (%s) is encrypted"
diff --git a/monitor.c b/monitor.c
index 2ac40c9..2e2b0e5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -5081,7 +5081,8 @@ static void handle_qmp_command(JSONMessageParser *parser,
QList *tokens)
trace_handle_qmp_command(mon, cmd_name);
cmd = qmp_find_cmd(cmd_name);
if (!cmd || invalid_qmp_mode(mon, cmd)) {
- qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
+ qerror_report(ERROR_CLASS_COMMAND_NOT_FOUND,
+ "The command %s has not been found", cmd_name);
goto err_out;
}
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 168b083..2227420 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -76,7 +76,8 @@ static QObject *do_qmp_dispatch(QObject *request, Error
**errp)
command = qdict_get_str(dict, "execute");
cmd = qmp_find_command(command);
if (cmd == NULL) {
- error_set(errp, QERR_COMMAND_NOT_FOUND, command);
+ error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+ "The command %s has not been found", command);
return NULL;
}
if (!cmd->enabled) {
--
1.9.3
- [Qemu-devel] [PULL 0/9] qmp hmp balloon: Cleanups around error reporting, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 3/9] hmp: Compile hmp_info_spice() only with CONFIG_SPICE, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 2/9] qmp hmp: Improve error messages when SPICE is not in use, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 1/9] qmp hmp: Factor out common "using spice" test, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 9/9] balloon: Eliminate silly QERR_ macros, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status(), Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro,
Markus Armbruster <=
- [Qemu-devel] [PULL 5/9] qmp: Simplify recognition of capability negotiation command, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 8/9] balloon: Factor out common "is balloon active" test, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 4/9] qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy, Markus Armbruster, 2015/02/05
- Re: [Qemu-devel] [PULL 0/9] qmp hmp balloon: Cleanups around error reporting, Peter Maydell, 2015/02/05