mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Inline QERR_INVALID_PARAMETER_TYPE definition (constant value)

Browse Source 
Address the comment added in commit 4629ed1e98
("qerror: Finally unused, clean up"), from 2015:

  /*
   * These macros will go away, please don't use
   * in new code, and do not add new ones!
   */

Mechanical transformation using the following
coccinelle semantic patch:

    @match@
    expression errp;
    expression param;
    constant value;
    @@
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE, param, value);

    @script:python strformat depends on match@
    value << match.value;
    fixedfmt; // new var
    @@
    fixedfmt = f'"Invalid parameter type for \'%s\', expected: {value[1:-1]}"'
    coccinelle.fixedfmt = cocci.make_ident(fixedfmt)

    @replace@
    expression match.errp;
    expression match.param;
    constant match.value;
    identifier strformat.fixedfmt;
    @@
    -    error_setg(errp, QERR_INVALID_PARAMETER_TYPE, param, value);
    +    error_setg(errp, fixedfmt, param);

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240312141343.3168265-7-armbru@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-03-12 15:13:39 +01:00 committed by Markus Armbruster
parent c6f5d406e1
commit aaeafa5090
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
qapi/qobject-input-visitor.c
View File

@ -288,8 +288,8 @@ static bool qobject_input_start_struct(Visitor *v, const char *name, void **obj,
return false;
}
if (qobject_type(qobj) != QTYPE_QDICT) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "object");
error_setg(errp, "Invalid parameter type for '%s', expected: object",
full_name(qiv, name));
return false;
}
@ -326,8 +326,8 @@ static bool qobject_input_start_list(Visitor *v, const char *name,
return false;
}
if (qobject_type(qobj) != QTYPE_QLIST) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "array");
error_setg(errp, "Invalid parameter type for '%s', expected: array",
full_name(qiv, name));
return false;
}
@ -405,8 +405,8 @@ static bool qobject_input_type_int64(Visitor *v, const char *name, int64_t *obj,
}
qnum = qobject_to(QNum, qobj);
if (!qnum || !qnum_get_try_int(qnum, obj)) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "integer");
error_setg(errp, "Invalid parameter type for '%s', expected: integer",
full_name(qiv, name));
return false;
}
return true;
@ -494,8 +494,8 @@ static bool qobject_input_type_bool(Visitor *v, const char *name, bool *obj,
}
qbool = qobject_to(QBool, qobj);
if (!qbool) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "boolean");
error_setg(errp, "Invalid parameter type for '%s', expected: boolean",
full_name(qiv, name));
return false;
}
@ -534,8 +534,8 @@ static bool qobject_input_type_str(Visitor *v, const char *name, char **obj,
}
qstr = qobject_to(QString, qobj);
if (!qstr) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "string");
error_setg(errp, "Invalid parameter type for '%s', expected: string",
full_name(qiv, name));
return false;
}
@ -565,8 +565,8 @@ static bool qobject_input_type_number(Visitor *v, const char *name, double *obj,
}
qnum = qobject_to(QNum, qobj);
if (!qnum) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "number");
error_setg(errp, "Invalid parameter type for '%s', expected: number",
full_name(qiv, name));
return false;
}
@ -587,8 +587,8 @@ static bool qobject_input_type_number_keyval(Visitor *v, const char *name,
if (qemu_strtod_finite(str, NULL, &val)) {
/* TODO report -ERANGE more nicely */
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "number");
error_setg(errp, "Invalid parameter type for '%s', expected: number",
full_name(qiv, name));
return false;
}
@ -623,8 +623,8 @@ static bool qobject_input_type_null(Visitor *v, const char *name,
}
if (qobject_type(qobj) != QTYPE_QNULL) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "null");
error_setg(errp, "Invalid parameter type for '%s', expected: null",
full_name(qiv, name));
return false;
}
*obj = qnull();

8
qapi/string-input-visitor.c
View File

@ -353,8 +353,8 @@ static bool parse_type_number(Visitor *v, const char *name, double *obj,
assert(siv->lm == LM_NONE);
if (qemu_strtod_finite(siv->string, NULL, &val)) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"number");
error_setg(errp, "Invalid parameter type for '%s', expected: number",
name ? name : "null");
return false;
}
@ -371,8 +371,8 @@ static bool parse_type_null(Visitor *v, const char *name, QNull **obj,
*obj = NULL;
if (siv->string[0]) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"null");
error_setg(errp, "Invalid parameter type for '%s', expected: null",
name ? name : "null");
return false;
}

12
qom/object.c
View File

@ -1495,7 +1495,8 @@ char *object_property_get_str(Object *obj, const char *name,
}
qstring = qobject_to(QString, ret);
if (!qstring) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "string");
error_setg(errp, "Invalid parameter type for '%s', expected: string",
name);
retval = NULL;
} else {
retval = g_strdup(qstring_get_str(qstring));
@ -1556,7 +1557,8 @@ bool object_property_get_bool(Object *obj, const char *name,
}
qbool = qobject_to(QBool, ret);
if (!qbool) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "boolean");
error_setg(errp, "Invalid parameter type for '%s', expected: boolean",
name);
retval = false;
} else {
retval = qbool_get_bool(qbool);
@ -1589,7 +1591,8 @@ int64_t object_property_get_int(Object *obj, const char *name,
qnum = qobject_to(QNum, ret);
if (!qnum || !qnum_get_try_int(qnum, &retval)) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "int");
error_setg(errp, "Invalid parameter type for '%s', expected: int",
name);
retval = -1;
}
@ -1663,7 +1666,8 @@ uint64_t object_property_get_uint(Object *obj, const char *name,
}
qnum = qobject_to(QNum, ret);
if (!qnum || !qnum_get_try_uint(qnum, &retval)) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "uint");
error_setg(errp, "Invalid parameter type for '%s', expected: uint",
name);
retval = 0;
}