summaryrefslogtreecommitdiff
path: root/migration.c
diff options
context:
space:
mode:
authorPeter Lieven <pl@kamp.de>2014-06-10 11:29:16 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2014-07-01 11:11:36 -0500
commit69b7aacc013ce99fe0c945c40c614228ce604a83 (patch)
treee9e962982463ed10f8e2853845023d634b70c8f4 /migration.c
parent3102b1a2211eb64b296326fd593b1dec309de6d0 (diff)
downloadqemu-69b7aacc013ce99fe0c945c40c614228ce604a83.tar.gz
migration: catch unknown flags in ram_load
if a saved vm has unknown flags in the memory data qemu currently simply ignores this flag and continues which yields in an unpredictable result. This patch catches all unknown flags and aborts the loading of the vm. Additionally error reports are thrown if the migration aborts abnormally. Signed-off-by: Peter Lieven <pl@kamp.de> Signed-off-by: Juan Quintela <quintela@redhat.com> (cherry picked from commit db80facefa62dff42bb50c73b0f03eda5f732b49) Conflicts: arch_init.c *removed unecessary context from 4798fe55 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'migration.c')
-rw-r--r--migration.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/migration.c b/migration.c
index 79c86c92da..22a1399290 100644
--- a/migration.c
+++ b/migration.c
@@ -105,7 +105,7 @@ static void process_incoming_migration_co(void *opaque)
ret = qemu_loadvm_state(f);
qemu_fclose(f);
if (ret < 0) {
- fprintf(stderr, "load of migration failed\n");
+ error_report("load of migration failed: %s", strerror(-ret));
exit(EXIT_FAILURE);
}
qemu_announce_self();