diff options
| author | Markus Armbruster | 2020-07-14 18:02:00 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2020-07-21 16:23:43 +0200 |
| commit | 7a309cc95b862be74711e7a35997daa3f885651a (patch) | |
| tree | 1417043015cf7f35de0ebd21ff2d72a05a5b3b52 /block | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200720'... (diff) | |
| download | qemu-7a309cc95b862be74711e7a35997daa3f885651a.tar.gz qemu-7a309cc95b862be74711e7a35997daa3f885651a.tar.xz qemu-7a309cc95b862be74711e7a35997daa3f885651a.zip | |
qom: Change object_get_canonical_path_component() not to malloc
object_get_canonical_path_component() returns a malloced copy of a
property name on success, null on failure.
19 of its 25 callers immediately free the returned copy.
Change object_get_canonical_path_component() to return the property
name directly. Since modifying the name would be wrong, adjust the
return type to const char *.
Drop the free from the 19 callers become simpler, add the g_strdup()
to the other six.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200714160202.3121879-4-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/throttle-groups.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/throttle-groups.c b/block/throttle-groups.c index 03a53c89ea..98fea7fd47 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -771,7 +771,7 @@ static void throttle_group_obj_complete(UserCreatable *obj, Error **errp) /* set group name to object id if it exists */ if (!tg->name && tg->parent_obj.parent) { - tg->name = object_get_canonical_path_component(OBJECT(obj)); + tg->name = g_strdup(object_get_canonical_path_component(OBJECT(obj))); } /* We must have a group name at this point */ assert(tg->name); |