Message ID | 20201211171152.146877-12-armbru@redhat.com |
---|---|
State | New |
Headers | show |
Series | Immutable QString, and also one JSON writer less | expand |
On Fri, Dec 11, 2020 at 06:11:43PM +0100, Markus Armbruster wrote: > 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> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
diff --git a/qom/object.c b/qom/object.c index 1065355233..89f5a63211 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1414,15 +1414,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);
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> --- qom/object.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)