Commit aafb21a0 authored by Peter Xu's avatar Peter Xu Committed by Eric Blake
Browse files

qobject: let object_property_get_str() use new API 



We can simplify object_property_get_str() using the new
qobject_get_try_str().

Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180309090006.10018-5-peterx@redhat.com>
[eblake: rebase context of qobject_to() macro]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent b26ae1cb

qom/object.c

+3 −6
Original line number Diff line number Diff line
@@ -1136,18 +1136,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);