diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-05 14:20:46 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-05 14:20:46 +0000 |
| commit | ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6 (patch) | |
| tree | 1ed2c16f95bcc6d5268afde9ca2a8321930b47a6 /migration/unix.c | |
| parent | d38ea87ac54af64ef611de434d07c12dc0399216 (diff) | |
| parent | 15d61692da651fc79b3fc40050b986c5a73055c0 (diff) | |
| download | focaccia-qemu-ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6.tar.gz focaccia-qemu-ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6.zip | |
Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-2' into staging
Migration pull req. Small fixes, nothing major. # gpg: Signature made Fri 05 Feb 2016 13:51:30 GMT using RSA key ID 854083B6 # gpg: Good signature from "Amit Shah <amit@amitshah.net>" # gpg: aka "Amit Shah <amit@kernel.org>" # gpg: aka "Amit Shah <amitshah@gmx.net>" * remotes/amit-migration/tags/migration-for-2.6-2: migration: fix bad string passed to error_report() static checker: e1000-82540em got aliased to e1000 migration: remove useless code. qmp-commands.hx: Document the missing options for migration capability commands qmp-commands.hx: Fix the missing options for migration parameters commands migration/ram: Fix some helper functions' parameter to use PageSearchStatus savevm: Split load vm state function qemu_loadvm_state migration: rename 'file' in MigrationState to 'to_dst_file' ram: Split host_from_stream_offset() into two helper functions Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/unix.c')
| -rw-r--r-- | migration/unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration/unix.c b/migration/unix.c index a721c4aaf3..d9aac36b9a 100644 --- a/migration/unix.c +++ b/migration/unix.c @@ -39,11 +39,11 @@ static void unix_wait_for_connect(int fd, Error *err, void *opaque) if (fd < 0) { DPRINTF("migrate connect error: %s\n", error_get_pretty(err)); - s->file = NULL; + s->to_dst_file = NULL; migrate_fd_error(s); } else { DPRINTF("migrate connect success\n"); - s->file = qemu_fopen_socket(fd, "wb"); + s->to_dst_file = qemu_fopen_socket(fd, "wb"); migrate_fd_connect(s); } } |