[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 23/28] migration: free SocketAddress where alloca
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v5 23/28] migration: free SocketAddress where allocated |
Date: |
Tue, 5 Dec 2017 14:53:02 +0800 |
Freeing the SocketAddress struct in socket_start_incoming_migration is
slightly confusing. Let's free the address in the same context where we
allocated it.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/socket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration/socket.c b/migration/socket.c
index dee869044a..4879f11e0f 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -172,7 +172,6 @@ static void socket_start_incoming_migration(SocketAddress
*saddr,
if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
object_unref(OBJECT(listen_ioc));
- qapi_free_SocketAddress(saddr);
return;
}
@@ -181,7 +180,6 @@ static void socket_start_incoming_migration(SocketAddress
*saddr,
socket_accept_incoming_migration,
listen_ioc,
(GDestroyNotify)object_unref);
- qapi_free_SocketAddress(saddr);
}
void tcp_start_incoming_migration(const char *host_port, Error **errp)
@@ -192,10 +190,12 @@ void tcp_start_incoming_migration(const char *host_port,
Error **errp)
socket_start_incoming_migration(saddr, &err);
}
error_propagate(errp, err);
+ qapi_free_SocketAddress(saddr);
}
void unix_start_incoming_migration(const char *path, Error **errp)
{
SocketAddress *saddr = unix_build_address(path);
socket_start_incoming_migration(saddr, errp);
+ qapi_free_SocketAddress(saddr);
}
--
2.14.3
- [Qemu-devel] [PATCH v5 13/28] migration: new state "postcopy-recover", (continued)
- [Qemu-devel] [PATCH v5 13/28] migration: new state "postcopy-recover", Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 14/28] migration: wakeup dst ram-load-thread for recover, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 15/28] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 16/28] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 17/28] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 18/28] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 19/28] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 20/28] migration: synchronize dirty bitmap for resume, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 22/28] migration: final handshake for the resume, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 21/28] migration: setup ramstate for resume, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 23/28] migration: free SocketAddress where allocated,
Peter Xu <=
- [Qemu-devel] [PATCH v5 24/28] migration: init dst in migration_object_init too, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 25/28] io: let watcher of the channel run in same ctx, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 26/28] migration: allow migrate_cancel to pause postcopy, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 27/28] qmp/migration: new command migrate-recover, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 28/28] hmp/migration: add migrate_recover command, Peter Xu, 2017/12/05
- Re: [Qemu-devel] [PATCH v5 00/28] Migration: postcopy failure recovery, Peter Xu, 2017/12/05
- Re: [Qemu-devel] [PATCH v5 00/28] Migration: postcopy failure recovery, Dr. David Alan Gilbert, 2017/12/05