Skip to content

Commit

Permalink
Revert "qobject: let object_property_get_str() use new API"
Browse files Browse the repository at this point in the history
Commit aafb21a "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 aafb21a.

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>
  • Loading branch information
Markus Armbruster committed Dec 19, 2020
1 parent 410f44f commit 26c5282
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions qom/object.c
Expand Up @@ -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);
Expand Down

0 comments on commit 26c5282

Please sign in to comment.