From: Peter Xu <pet...@redhat.com> We can simplify object_property_get_str() using the new qobject_get_try_str().
Reviewed-by: Fam Zheng <f...@redhat.com> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Signed-off-by: Peter Xu <pet...@redhat.com> Message-Id: <20180309090006.10018-5-pet...@redhat.com> [eblake: rebase context of qobject_to() macro] Signed-off-by: Eric Blake <ebl...@redhat.com> --- qom/object.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/qom/object.c b/qom/object.c index 7b3a6158fde..1c1b8cf8be0 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1123,18 +1123,15 @@ 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; } - qstring = qobject_to(QString, ret); - if (!qstring) { + + retval = g_strdup(qobject_get_try_str(ret)); + if (!retval) { error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "string"); - retval = NULL; - } else { - retval = g_strdup(qstring_get_str(qstring)); } qobject_decref(ret); -- 2.14.3