diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-15 13:17:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-15 13:17:47 +0000 |
| commit | f521eeee3bd060b460c99e605472b7e03967db43 (patch) | |
| tree | f782ce0bb091b973fa82ef04a7afed9989129e1a /migration/socket.c | |
| parent | fd06527b80c88c8dde1b35fdc692685b68d2fd93 (diff) | |
| parent | 816306826a45f4d15352e32d157172af3a35899f (diff) | |
| download | focaccia-qemu-f521eeee3bd060b460c99e605472b7e03967db43.tar.gz focaccia-qemu-f521eeee3bd060b460c99e605472b7e03967db43.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20180115' into staging
migration/next for 20180115 # gpg: Signature made Mon 15 Jan 2018 11:51:00 GMT # gpg: using RSA key 0xF487EF185872D723 # gpg: Good signature from "Juan Quintela <quintela@redhat.com>" # gpg: aka "Juan Quintela <quintela@trasno.org>" # Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723 * remotes/juanquintela/tags/migration/20180115: (27 commits) migration: remove notify in fd_error migration: remove some block_cleanup_parameters() migration: put the finish part into a new function migration: major cleanup for migrate iterations migration: cleanup stats update into function migration: use switch at the end of migration migration: introduce migrate_calculate_complete migration: introduce downtime_start migration: move vm_old_running into global state migration: split use of MigrationState.total_time migration: remove "enable_colo" var migration: qemu_savevm_state_cleanup() in cleanup migration: assert colo instead of check migration: finalize current_migration object migration: Guard ram_bytes_remaining against early call migration: add postcopy total blocktime into query-migrate migration: add blocktime calculation into migration-test migration: postcopy_blocktime documentation migration: calculate vCPU blocktime on dst side migration: add postcopy blocktime ctx into MigrationIncomingState ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/socket.c')
| -rw-r--r-- | migration/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration/socket.c b/migration/socket.c index dee869044a..3a8232dd2d 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) @@ -191,6 +189,7 @@ void tcp_start_incoming_migration(const char *host_port, Error **errp) if (!err) { socket_start_incoming_migration(saddr, &err); } + qapi_free_SocketAddress(saddr); error_propagate(errp, err); } @@ -198,4 +197,5 @@ 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); } |