aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2024-03-12 15:13:38 +0100
committerMarkus Armbruster <armbru@redhat.com>2024-04-24 09:50:58 +0200
commitc6f5d406e1ace1e3d7697e085024a3c7b93d6db5 (patch)
tree54fe10c9f3d3b2ac0fb8306b30373ab6ffd404a5 /util
parentf95b25c37e34d575346fb171b2f59c162bbefb38 (diff)
downloadqemu-c6f5d406e1ace1e3d7697e085024a3c7b93d6db5.zip
qemu-c6f5d406e1ace1e3d7697e085024a3c7b93d6db5.tar.gz
qemu-c6f5d406e1ace1e3d7697e085024a3c7b93d6db5.tar.bz2
qapi: Inline and remove QERR_INVALID_PARAMETER definition
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: $ sed -i -e "s/QERR_INVALID_PARAMETER,/\"Invalid parameter '%s'\",/" \ $(git grep -lw QERR_INVALID_PARAMETER) Manually simplify qemu_opts_create(), and remove the macro definition in include/qapi/qmp/qerror.h. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-ID: <20240312141343.3168265-6-armbru@redhat.com>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-option.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/qemu-option.c b/util/qemu-option.c
index eedd089..201f7a8 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -498,7 +498,7 @@ static bool opt_validate(QemuOpt *opt, Error **errp)
desc = find_desc_by_name(list->desc, opt->name);
if (!desc && !opts_accepts_any(list)) {
- error_setg(errp, QERR_INVALID_PARAMETER, opt->name);
+ error_setg(errp, "Invalid parameter '%s'", opt->name);
return false;
}
@@ -531,7 +531,7 @@ bool qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val,
desc = find_desc_by_name(list->desc, name);
if (!desc && !opts_accepts_any(list)) {
- error_setg(errp, QERR_INVALID_PARAMETER, name);
+ error_setg(errp, "Invalid parameter '%s'", name);
return false;
}
@@ -554,7 +554,7 @@ bool qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val,
desc = find_desc_by_name(list->desc, name);
if (!desc && !opts_accepts_any(list)) {
- error_setg(errp, QERR_INVALID_PARAMETER, name);
+ error_setg(errp, "Invalid parameter '%s'", name);
return false;
}
@@ -612,7 +612,7 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,
if (list->merge_lists) {
if (id) {
- error_setg(errp, QERR_INVALID_PARAMETER, "id");
+ error_setg(errp, "Invalid parameter 'id'");
return NULL;
}
opts = qemu_opts_find(list, NULL);
@@ -1103,7 +1103,7 @@ bool qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp)
QTAILQ_FOREACH(opt, &opts->head, next) {
opt->desc = find_desc_by_name(desc, opt->name);
if (!opt->desc) {
- error_setg(errp, QERR_INVALID_PARAMETER, opt->name);
+ error_setg(errp, "Invalid parameter '%s'", opt->name);
return false;
}