[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 04/27] qobject: let object_property_get_str() use n
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v3 04/27] qobject: let object_property_get_str() use new API |
Date: |
Mon, 6 Nov 2017 17:46:20 +0800 |
We can simplify object_property_get_str() using the new
qobject_get_try_str().
Signed-off-by: Peter Xu <address@hidden>
---
qom/object.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index c58c52d518..9cbeb51f0b 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1116,18 +1116,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.13.5
- Re: [Qemu-devel] [RFC v3 01/27] char-io: fix possible race on IOWatchPoll, (continued)
- Re: [Qemu-devel] [RFC v3 01/27] char-io: fix possible race on IOWatchPoll, Stefan Hajnoczi, 2017/11/13
- Re: [Qemu-devel] [RFC v3 01/27] char-io: fix possible race on IOWatchPoll, Peter Xu, 2017/11/14
- Re: [Qemu-devel] [RFC v3 01/27] char-io: fix possible race on IOWatchPoll, Stefan Hajnoczi, 2017/11/14
- Re: [Qemu-devel] [RFC v3 01/27] char-io: fix possible race on IOWatchPoll, Peter Xu, 2017/11/14
- Re: [Qemu-devel] [RFC v3 01/27] char-io: fix possible race on IOWatchPoll, Stefan Hajnoczi, 2017/11/15
- Re: [Qemu-devel] [RFC v3 01/27] char-io: fix possible race on IOWatchPoll, Peter Xu, 2017/11/15
[Qemu-devel] [RFC v3 02/27] qobject: introduce qstring_get_try_str(), Peter Xu, 2017/11/06
[Qemu-devel] [RFC v3 03/27] qobject: introduce qobject_get_try_str(), Peter Xu, 2017/11/06
[Qemu-devel] [RFC v3 04/27] qobject: let object_property_get_str() use new API,
Peter Xu <=
[Qemu-devel] [RFC v3 05/27] monitor: move skip_flush into monitor_data_init, Peter Xu, 2017/11/06
[Qemu-devel] [RFC v3 06/27] qjson: add "opaque" field to JSONMessageParser, Peter Xu, 2017/11/06
[Qemu-devel] [RFC v3 07/27] monitor: move the cur_mon hack deeper for QMP, Peter Xu, 2017/11/06
[Qemu-devel] [RFC v3 08/27] monitor: unify global init, Peter Xu, 2017/11/06
[Qemu-devel] [RFC v3 09/27] monitor: let mon_list be tail queue, Peter Xu, 2017/11/06