[PATCH-for-5.2 3/5] qom: Use g_autofree in ObjectPropertyGet functions

[Philippe Mathieu-Daudé]

By using g_autofree we make it easier to have ObjectPropertyGet
methods return a value (see next commit).

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 backends/tpm/tpm_util.c          |  3 +--
 hw/block/xen-block.c             |  3 +--
 hw/core/qdev-properties-system.c | 13 +++++--------
 hw/mem/nvdimm.c                  |  3 +--
 hw/ppc/spapr_caps.c              |  3 +--
 qom/object.c                     |  6 ++----
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
index b58d298c1a..235b006498 100644
--- a/backends/tpm/tpm_util.c
+++ b/backends/tpm/tpm_util.c
@@ -37,11 +37,10 @@ static void get_tpm(Object *obj, Visitor *v, const char 
*name, void *opaque,
 {
     DeviceState *dev = DEVICE(obj);
     TPMBackend **be = qdev_get_prop_ptr(dev, opaque);
-    char *p;
+    g_autofree char *p;
 
     p = g_strdup(*be ? (*be)->id : "");
     visit_type_str(v, name, &p, errp);
-    g_free(p);
 }
 
 static void set_tpm(Object *obj, Visitor *v, const char *name, void *opaque,
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index 8a7a3f5452..8c23b895d9 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -338,7 +338,7 @@ static void xen_block_get_vdev(Object *obj, Visitor *v, 
const char *name,
     DeviceState *dev = DEVICE(obj);
     Property *prop = opaque;
     XenBlockVdev *vdev = qdev_get_prop_ptr(dev, prop);
-    char *str;
+    g_autofree char *str = NULL;
 
     switch (vdev->type) {
     case XEN_BLOCK_VDEV_TYPE_DP:
@@ -366,7 +366,6 @@ static void xen_block_get_vdev(Object *obj, Visitor *v, 
const char *name,
     }
 
     visit_type_str(v, name, &str, errp);
-    g_free(str);
 }
 
 static int vbd_name_to_disk(const char *name, const char **endp,
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 3e4f16fc21..28682eda31 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -56,7 +56,7 @@ static void get_drive(Object *obj, Visitor *v, const char 
*name, void *opaque,
     Property *prop = opaque;
     void **ptr = qdev_get_prop_ptr(dev, prop);
     const char *value;
-    char *p;
+    g_autofree char *p;
 
     if (*ptr) {
         value = blk_name(*ptr);
@@ -72,7 +72,6 @@ static void get_drive(Object *obj, Visitor *v, const char 
*name, void *opaque,
 
     p = g_strdup(value);
     visit_type_str(v, name, &p, errp);
-    g_free(p);
 }
 
 static void set_drive_helper(Object *obj, Visitor *v, const char *name,
@@ -213,11 +212,10 @@ static void get_chr(Object *obj, Visitor *v, const char 
*name, void *opaque,
 {
     DeviceState *dev = DEVICE(obj);
     CharBackend *be = qdev_get_prop_ptr(dev, opaque);
-    char *p;
+    g_autofree char *p;
 
     p = g_strdup(be->chr && be->chr->label ? be->chr->label : "");
     visit_type_str(v, name, &p, errp);
-    g_free(p);
 }
 
 static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,
@@ -287,10 +285,10 @@ static void get_netdev(Object *obj, Visitor *v, const 
char *name,
     DeviceState *dev = DEVICE(obj);
     Property *prop = opaque;
     NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
-    char *p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : "");
+    g_autofree char *p;
 
+    p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : "");
     visit_type_str(v, name, &p, errp);
-    g_free(p);
 }
 
 static void set_netdev(Object *obj, Visitor *v, const char *name,
@@ -367,10 +365,9 @@ static void get_audiodev(Object *obj, Visitor *v, const 
char* name,
     DeviceState *dev = DEVICE(obj);
     Property *prop = opaque;
     QEMUSoundCard *card = qdev_get_prop_ptr(dev, prop);
-    char *p = g_strdup(audio_get_id(card));
+    g_autofree char *p = g_strdup(audio_get_id(card));
 
     visit_type_str(v, name, &p, errp);
-    g_free(p);
 }
 
 static void set_audiodev(Object *obj, Visitor *v, const char* name,
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index d0d6e553cf..b55de7dbe1 100644
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -69,12 +69,11 @@ static void nvdimm_get_uuid(Object *obj, Visitor *v, const 
char *name,
                                   void *opaque, Error **errp)
 {
     NVDIMMDevice *nvdimm = NVDIMM(obj);
-    char *value = NULL;
+    g_autofree char *value = NULL;
 
     value = qemu_uuid_unparse_strdup(&nvdimm->uuid);
 
     visit_type_str(v, name, &value, errp);
-    g_free(value);
 }
 
 
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index 7558db0c8b..cbc09b24b6 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -101,7 +101,7 @@ static void  spapr_cap_get_string(Object *obj, Visitor *v, 
const char *name,
 {
     SpaprCapabilityInfo *cap = opaque;
     SpaprMachineState *spapr = SPAPR_MACHINE(obj);
-    char *val = NULL;
+    g_autofree char *val = NULL;
     uint8_t value = spapr_get_cap(spapr, cap->index);
 
     if (value >= cap->possible->num) {
@@ -112,7 +112,6 @@ static void  spapr_cap_get_string(Object *obj, Visitor *v, 
const char *name,
     val = g_strdup(cap->possible->vals[value]);
 
     visit_type_str(v, name, &val, errp);
-    g_free(val);
 }
 
 static void spapr_cap_set_string(Object *obj, Visitor *v, const char *name,
diff --git a/qom/object.c b/qom/object.c
index e5324f2af7..7c13117f7d 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1649,11 +1649,10 @@ static void object_get_child_property(Object *obj, 
Visitor *v,
                                       Error **errp)
 {
     Object *child = opaque;
-    char *path;
+    g_autofree char *path;
 
     path = object_get_canonical_path(child);
     visit_type_str(v, name, &path, errp);
-    g_free(path);
 }
 
 static Object *object_resolve_child_property(Object *parent, void *opaque,
@@ -2099,7 +2098,7 @@ static void property_get_str(Object *obj, Visitor *v, 
const char *name,
                              void *opaque, Error **errp)
 {
     StringProperty *prop = opaque;
-    char *value;
+    g_autofree char *value = NULL;
     Error *err = NULL;
 
     value = prop->get(obj, &err);
@@ -2109,7 +2108,6 @@ static void property_get_str(Object *obj, Visitor *v, 
const char *name,
     }
 
     visit_type_str(v, name, &value, errp);
-    g_free(value);
 }
 
 static void property_set_str(Object *obj, Visitor *v, const char *name,
-- 
2.21.3