[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/33] Revert "qobject: let object_property_get_str() use new API"
From: |
Markus Armbruster |
Subject: |
[PULL 24/33] Revert "qobject: let object_property_get_str() use new API" |
Date: |
Sat, 19 Dec 2020 11:55:23 +0100 |
Commit aafb21a0b9 "qobject: let object_property_get_str() use new API"
isn't much of a simplification. Not worth having
object_property_get_str() differ from the other
object_property_get_FOO(). Revert.
This reverts commit aafb21a0b9cea5fa0fe52e68111bb6bd13837a02.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201211171152.146877-12-armbru@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
---
qom/object.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index f2ae6e6b2a..5cd43fe366 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1415,15 +1415,18 @@ char *object_property_get_str(Object *obj, const char
*name,
Error **errp)
{
QObject *ret = object_property_get_qobject(obj, name, errp);
+ QString *qstring;
char *retval;
if (!ret) {
return NULL;
}
-
- retval = g_strdup(qobject_get_try_str(ret));
- if (!retval) {
+ qstring = qobject_to(QString, ret);
+ if (!qstring) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "string");
+ retval = NULL;
+ } else {
+ retval = g_strdup(qstring_get_str(qstring));
}
qobject_unref(ret);
--
2.26.2
- [PULL 31/33] keyval: Use GString to accumulate value strings, (continued)
- [PULL 31/33] keyval: Use GString to accumulate value strings, Markus Armbruster, 2020/12/19
- [PULL 18/33] qobject: Change qobject_to_json()'s value to GString, Markus Armbruster, 2020/12/19
- [PULL 33/33] qobject: Make QString immutable, Markus Armbruster, 2020/12/19
- [PULL 27/33] qobject: Factor quoted_str() out of to_json(), Markus Armbruster, 2020/12/19
- [PULL 29/33] migration: Replace migration's JSON writer by the general one, Markus Armbruster, 2020/12/19
- [PULL 32/33] block: Use GString instead of QString to build filenames, Markus Armbruster, 2020/12/19
- [PULL 21/33] qobject: Move internals to qobject-internal.h, Markus Armbruster, 2020/12/19
- [PULL 14/33] hmp: Simplify how qmp_human_monitor_command() gets output, Markus Armbruster, 2020/12/19
- [PULL 17/33] qobject: Use GString instead of QString to accumulate JSON, Markus Armbruster, 2020/12/19
- [PULL 03/33] qapi: Use QAPI_LIST_PREPEND() where possible, Markus Armbruster, 2020/12/19
- [PULL 24/33] Revert "qobject: let object_property_get_str() use new API",
Markus Armbruster <=
- Re: [PULL 00/33] QAPI patches patches for 2020-12-19, no-reply, 2020/12/19