migration: using qapi_free_SocketAddress instead of g_free

[PATCH] migration: using qapi_free_SocketAddress instead of g_free

lijiejun posted 1 patch 11 months, 3 weeks ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231206100111.2996016-1-a._5Flijiejun@163.com

Maintainers: Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Leonardo Bras <leobras@redhat.com>

migration/migration.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] migration: using qapi_free_SocketAddress instead of g_free

Posted by lijiejun 11 months, 3 weeks ago

use unified function qapi_free_SocketAddress to free SocketAddress
object.

Signed-off-by: lijiejun <a_lijiejun@163.com>
---
 migration/migration.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index 3ce04b2aaf..e78d31bbbf 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -493,7 +493,7 @@ bool migrate_uri_parse(const char *uri, MigrationChannel **channel,
         addr->u.socket.type = saddr->type;
         addr->u.socket.u = saddr->u;
         /* Don't free the objects inside; their ownership moved to "addr" */
-        g_free(saddr);
+        qapi_free_SocketAddress(saddr);
     } else if (strstart(uri, "file:", NULL)) {
         addr->transport = MIGRATION_ADDRESS_TYPE_FILE;
         addr->u.file.filename = g_strdup(uri + strlen("file:"));
-- 
2.25.1

Re: [PATCH] migration: using qapi_free_SocketAddress instead of g_free

Posted by Daniel P. Berrangé 11 months, 3 weeks ago

On Wed, Dec 06, 2023 at 06:01:11PM +0800, lijiejun wrote:
> use unified function qapi_free_SocketAddress to free SocketAddress
> object.
> 
> Signed-off-by: lijiejun <a_lijiejun@163.com>
> ---
>  migration/migration.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index 3ce04b2aaf..e78d31bbbf 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -493,7 +493,7 @@ bool migrate_uri_parse(const char *uri, MigrationChannel **channel,
>          addr->u.socket.type = saddr->type;
>          addr->u.socket.u = saddr->u;
>          /* Don't free the objects inside; their ownership moved to "addr" */
> -        g_free(saddr);
> +        qapi_free_SocketAddress(saddr);

The comment on the line above that explains we only want to free
'saddr', not its contents.

>      } else if (strstart(uri, "file:", NULL)) {
>          addr->transport = MIGRATION_ADDRESS_TYPE_FILE;
>          addr->u.file.filename = g_strdup(uri + strlen("file:"));
> -- 
> 2.25.1
> 
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|