[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 10/28] qmp: Improve QMP dispatch error messag
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v4 10/28] qmp: Improve QMP dispatch error messages |
Date: |
Sun, 05 Mar 2017 09:01:07 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) |
Philippe Mathieu-Daudé <address@hidden> writes:
> Hi Markus,
>
> On 03/03/2017 09:32 AM, Markus Armbruster wrote:
>> Signed-off-by: Markus Armbruster <address@hidden>
>> Reviewed-by: Eric Blake <address@hidden>
>> ---
>> qapi/qmp-dispatch.c | 14 ++++++++------
>> 1 file changed, 8 insertions(+), 6 deletions(-)
>>
>> diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
>> index 23b0528..578c6d8 100644
>> --- a/qapi/qmp-dispatch.c
>> +++ b/qapi/qmp-dispatch.c
>> @@ -30,7 +30,7 @@ static QDict *qmp_dispatch_check_obj(const QObject
>> *request, Error **errp)
>>
>> dict = qobject_to_qdict(request);
>> if (!dict) {
>> - error_setg(errp, "Expected '%s' in QMP input", "object");
>> + error_setg(errp, "QMP input must be a JSON object");
>> return NULL;
>> }
>>
>> @@ -41,15 +41,17 @@ static QDict *qmp_dispatch_check_obj(const QObject
>> *request, Error **errp)
>>
>> if (!strcmp(arg_name, "execute")) {
>> if (qobject_type(arg_obj) != QTYPE_QSTRING) {
>> - error_setg(errp, "QMP input object member '%s' expects
>> '%s'",
>> - "execute", "string");
>> + error_setg(errp,
>> + "QMP input object member '%s' must be %s",
>> + "execute", "a string");
>
> let's avoid formatting like the rest of this patch.
>
>> return NULL;
>> }
>> has_exec_key = true;
>> } else if (!strcmp(arg_name, "arguments")) {
>> if (qobject_type(arg_obj) != QTYPE_QDICT) {
>> - error_setg(errp, "QMP input object member '%s' expects
>> '%s'",
>> - "arguments", "object");
>> + error_setg(errp,
>> + "QMP input object member '%s' must be %s",
>> + "arguments", "an object");
>
> same.
>
>> return NULL;
>> }
>> } else {
>> @@ -60,7 +62,7 @@ static QDict *qmp_dispatch_check_obj(const QObject
>> *request, Error **errp)
>> }
>>
>> if (!has_exec_key) {
>> - error_setg(errp, "Expected '%s' in QMP input", "execute");
>> + error_setg(errp, "QMP input object lacks key 'execute'");
>> return NULL;
>> }
>>
>>
Since substantial other work depends on this series, it needs to go in
sooner rather than later. I'm therefore *dropping* this patch from the
series. We can then bikeshed^Wpolish to our heart's content without
holding up other work.
That said: what about this?
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index dc50212..5ad36f8 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -30,7 +30,7 @@ static QDict *qmp_dispatch_check_obj(const QObject *request,
Error **errp)
dict = qobject_to_qdict(request);
if (!dict) {
- error_setg(errp, "Expected '%s' in QMP input", "object");
+ error_setg(errp, "QMP input must be a JSON object");
return NULL;
}
@@ -41,26 +41,26 @@ static QDict *qmp_dispatch_check_obj(const QObject
*request, Error **errp)
if (!strcmp(arg_name, "execute")) {
if (qobject_type(arg_obj) != QTYPE_QSTRING) {
- error_setg(errp, "QMP input object member '%s' expects '%s'",
- "execute", "string");
+ error_setg(errp,
+ "QMP input member 'execute' must be a string");
return NULL;
}
has_exec_key = true;
} else if (!strcmp(arg_name, "arguments")) {
if (qobject_type(arg_obj) != QTYPE_QDICT) {
- error_setg(errp, "QMP input object member '%s' expects '%s'",
- "arguments", "object");
+ error_setg(errp,
+ "QMP input member 'arguments' must be an object");
return NULL;
}
} else {
- error_setg(errp, "QMP input object member '%s' is unexpected",
+ error_setg(errp, "QMP input member '%s' is unexpected",
arg_name);
return NULL;
}
}
if (!has_exec_key) {
- error_setg(errp, "Expected '%s' in QMP input", "execute");
+ error_setg(errp, "QMP input lacks member 'execute'");
return NULL;
}
[Qemu-devel] [PATCH v4 13/28] qapi: Make QObject input visitor set *list reliably, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 03/28] qmp-test: New, covering basic QMP protocol, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 08/28] qmp: Drop duplicated QMP command object checks, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 09/28] qmp: Eliminate silly QERR_QMP_* macros, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 18/28] test-qobject-input-visitor: Use strict visitor, Markus Armbruster, 2017/03/03