aboutsummaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2024-03-12 15:13:39 +0100
committerMarkus Armbruster <armbru@redhat.com>2024-04-24 09:50:58 +0200
commitaaeafa5090c8d006d7c39b4e11bcfb8515ef1ece (patch)
treee0075f555ac0562395b28432dc13f5d60e6e5449 /qom
parentc6f5d406e1ace1e3d7697e085024a3c7b93d6db5 (diff)
downloadqemu-aaeafa5090c8d006d7c39b4e11bcfb8515ef1ece.zip
qemu-aaeafa5090c8d006d7c39b4e11bcfb8515ef1ece.tar.gz
qemu-aaeafa5090c8d006d7c39b4e11bcfb8515ef1ece.tar.bz2
qapi: Inline QERR_INVALID_PARAMETER_TYPE definition (constant value)
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>
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/qom/object.c b/qom/object.c
index d4a001c..3d96818 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -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;
}