[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/21] qapi: Inline and remove QERR_MISSING_PARAMETER definition
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 16/21] qapi: Inline and remove QERR_MISSING_PARAMETER definition |
Date: |
Wed, 4 Oct 2023 19:31:51 +0200 |
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, manually
removing the definition in include/qapi/qmp/qerror.h.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/qapi/qmp/qerror.h | 3 ---
qapi/opts-visitor.c | 2 +-
qapi/qapi-forward-visitor.c | 2 +-
qapi/qobject-input-visitor.c | 2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index cc4dae1076..b0f48f22fe 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -17,9 +17,6 @@
* add new ones!
*/
-#define QERR_MISSING_PARAMETER \
- "Parameter '%s' is missing"
-
#define QERR_PROPERTY_VALUE_BAD \
"Property '%s.%s' doesn't take value '%s'"
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 844db583f4..bf0d8acbd6 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -218,7 +218,7 @@ lookup_distinct(const OptsVisitor *ov, const char *name,
Error **errp)
list = g_hash_table_lookup(ov->unprocessed_opts, name);
if (!list) {
- error_setg(errp, QERR_MISSING_PARAMETER, name);
+ error_setg(errp, "Parameter '%s' is missing", name);
}
return list;
}
diff --git a/qapi/qapi-forward-visitor.c b/qapi/qapi-forward-visitor.c
index e36d9bc9ba..3fb2c954aa 100644
--- a/qapi/qapi-forward-visitor.c
+++ b/qapi/qapi-forward-visitor.c
@@ -49,7 +49,7 @@ static bool forward_field_translate_name(ForwardFieldVisitor
*v, const char **na
*name = v->to;
return true;
}
- error_setg(errp, QERR_MISSING_PARAMETER, *name);
+ error_setg(errp, "Parameter '%s' is missing", *name);
return false;
}
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index f5fa6c1878..17e9f3b638 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -168,7 +168,7 @@ static QObject
*qobject_input_get_object(QObjectInputVisitor *qiv,
QObject *obj = qobject_input_try_get_object(qiv, name, consume);
if (!obj) {
- error_setg(errp, QERR_MISSING_PARAMETER, full_name(qiv, name));
+ error_setg(errp, "Parameter '%s' is missing", full_name(qiv, name));
}
return obj;
}
--
2.41.0
- [PATCH 09/21] qapi: Inline and remove QERR_INVALID_PARAMETER_TYPE definition, (continued)
- [PATCH 09/21] qapi: Inline and remove QERR_INVALID_PARAMETER_TYPE definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 11/21] qapi: Inline QERR_INVALID_PARAMETER_VALUE definition (constant param), Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 13/21] qapi: Inline and remove QERR_IO_ERROR definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 12/21] qapi: Inline and remove QERR_INVALID_PARAMETER_VALUE definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 14/21] qapi: Inline and remove QERR_MIGRATION_ACTIVE definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 15/21] qapi: Inline QERR_MISSING_PARAMETER definition (constant parameter), Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 16/21] qapi: Inline and remove QERR_MISSING_PARAMETER definition,
Philippe Mathieu-Daudé <=
- [PATCH 18/21] qapi: Inline and remove QERR_PROPERTY_VALUE_OUT_OF_RANGE definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 17/21] qapi: Inline and remove QERR_PROPERTY_VALUE_BAD definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 19/21] qapi: Inline and remove QERR_QGA_COMMAND_FAILED definition, Philippe Mathieu-Daudé, 2023/10/04
- [RFC PATCH 20/21] qapi: Inline and remove QERR_UNSUPPORTED definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 21/21] qapi: Remove 'qapi/qmp/qerror.h' header, Philippe Mathieu-Daudé, 2023/10/04