mirror of
https://github.com/mii443/qemu.git
synced 2025-12-03 11:08:25 +00:00
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>
This commit is contained in:
@@ -165,7 +165,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp)
|
||||
{
|
||||
Error *local_error = NULL;
|
||||
IOThread *iothread = IOTHREAD(obj);
|
||||
char *name, *thread_name;
|
||||
char *thread_name;
|
||||
|
||||
iothread->stopping = false;
|
||||
iothread->running = true;
|
||||
@@ -195,12 +195,11 @@ static void iothread_complete(UserCreatable *obj, Error **errp)
|
||||
/* This assumes we are called from a thread with useful CPU affinity for us
|
||||
* to inherit.
|
||||
*/
|
||||
name = object_get_canonical_path_component(OBJECT(obj));
|
||||
thread_name = g_strdup_printf("IO %s", name);
|
||||
thread_name = g_strdup_printf("IO %s",
|
||||
object_get_canonical_path_component(OBJECT(obj)));
|
||||
qemu_thread_create(&iothread->thread, thread_name, iothread_run,
|
||||
iothread, QEMU_THREAD_JOINABLE);
|
||||
g_free(thread_name);
|
||||
g_free(name);
|
||||
|
||||
/* Wait for initialization to complete */
|
||||
while (iothread->thread_id == -1) {
|
||||
@@ -303,7 +302,7 @@ type_init(iothread_register_types)
|
||||
|
||||
char *iothread_get_id(IOThread *iothread)
|
||||
{
|
||||
return object_get_canonical_path_component(OBJECT(iothread));
|
||||
return g_strdup(object_get_canonical_path_component(OBJECT(iothread)));
|
||||
}
|
||||
|
||||
AioContext *iothread_get_aio_context(IOThread *iothread)
|
||||
|
||||
Reference in New Issue
Block a user