diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-01-23 22:32:06 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-02-06 13:36:49 +0100 |
| commit | b4b076daf324894dd288cbdb67ff1e3c7434df7b (patch) | |
| tree | 4cea3be1ee1ae6b95388f04b389b40a42b585f17 /migration/savevm.c | |
| parent | 7d2c6c95511e42dffe2b263275e09957723d0ff4 (diff) | |
| download | qemu-b4b076daf324894dd288cbdb67ff1e3c7434df7b.zip | |
migration: create Migration Incoming State at init time
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1485207141-1941-3-git-send-email-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration/savevm.c')
| -rw-r--r-- | migration/savevm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 204012ecef..f3644ca1d7 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2199,7 +2199,6 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp) qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-load-state"); f = qemu_fopen_channel_input(QIO_CHANNEL(ioc)); - migration_incoming_state_new(f); ret = qemu_loadvm_state(f); qemu_fclose(f); if (ret < 0) { @@ -2215,6 +2214,7 @@ int load_vmstate(const char *name) QEMUFile *f; int ret; AioContext *aio_context; + MigrationIncomingState *mis = migration_incoming_get_current(); if (!bdrv_all_can_snapshot(&bs)) { error_report("Device '%s' is writable but does not support snapshots.", @@ -2265,7 +2265,7 @@ int load_vmstate(const char *name) } qemu_system_reset(VMRESET_SILENT); - migration_incoming_state_new(f); + mis->from_src_file = f; aio_context_acquire(aio_context); ret = qemu_loadvm_state(f); |