[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 04/22] qobject: let object_property_get_str() use n
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v2 04/22] qobject: let object_property_get_str() use new API |
Date: |
Fri, 29 Sep 2017 11:38:26 +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 6a7bd9257b..d76a0ee797 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1107,18 +1107,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
- [Qemu-devel] [RFC v2 00/22] QMP: out-of-band (OOB) execution support, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 01/22] char-io: fix possible race on IOWatchPoll, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 02/22] qobject: introduce qstring_get_try_str(), Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 03/22] qobject: introduce qobject_get_try_str(), Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 04/22] qobject: let object_property_get_str() use new API,
Peter Xu <=
- [Qemu-devel] [RFC v2 05/22] monitor: move skip_flush into monitor_data_init, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 06/22] qjson: add "opaque" field to JSONMessageParser, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 08/22] monitor: unify global init, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 07/22] monitor: move the cur_mon hack deeper for QMP, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 09/22] monitor: create monitor dedicate iothread, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 10/22] monitor: allow to use IO thread for parsing, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 11/22] monitor: introduce monitor_qmp_respond(), Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 12/22] monitor: let mon_list be tail queue, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 13/22] monitor: separate QMP parser and dispatcher, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 14/22] qmp: add new event "request-dropped", Peter Xu, 2017/09/28