diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-05 16:52:12 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-05 16:52:35 +0100 |
| commit | 4aee86c60a53a3478d9799a4464cf0bc08071148 (patch) | |
| tree | a8fa7c5aba4aa18e52fd8182cce9cc5872df1fa3 /migration/socket.c | |
| parent | bc56fd3a23c94302937ed023d33e17a2de1a1b2a (diff) | |
| parent | 1db9d8e501fc99fa2201f228627952aee6cfc349 (diff) | |
| download | focaccia-qemu-4aee86c60a53a3478d9799a4464cf0bc08071148.tar.gz focaccia-qemu-4aee86c60a53a3478d9799a4464cf0bc08071148.zip | |
Merge remote-tracking branch 'quintela/tags/migration/20170504' into staging
migration/next for 20170504 # gpg: Signature made Thu 04 May 2017 10:35:41 AM BST # 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 * quintela/tags/migration/20170504: migration: Extra tracing migration: Move postcopy-ram.h to migration/ monitor: Move hmp_info_snapshots from savevm.c to hmp.c monitor: Move hmp_delvm from savevm.c to hmp.c monitor: Move hmp_savevm from savevm.c to hmp.c monitor: Move hmp_loadvm from monitor.c to hmp.c monitor: Remove monitor parameter from save_vmstate migration: to_dst_file at that point is NULL migration: setup bi-directional I/O channel for exec: protocol ram: Split dirty bitmap by RAMBlock Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'migration/socket.c')
| -rw-r--r-- | migration/socket.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/migration/socket.c b/migration/socket.c index 13966f1d26..dc88812048 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -79,7 +79,6 @@ static void socket_outgoing_migration(QIOTask *task, if (qio_task_propagate_error(task, &err)) { trace_migration_socket_outgoing_error(error_get_pretty(err)); - data->s->to_dst_file = NULL; migrate_fd_error(data->s, err); error_free(err); } else { |