mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
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: Fam Zheng <famz@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20180309090006.10018-5-peterx@redhat.com> [eblake: rebase context of qobject_to() macro] Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
b26ae1cb8e
commit
aafb21a0b9
1 changed files with 3 additions and 6 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue