aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2010-07-27 15:49:19 +0530
committerAurelien Jarno <aurelien@aurel32.net>2010-07-30 23:14:08 +0200
commit8e84865e54cb66fd7b57bb18c312ad3d56b6e276 (patch)
tree92f787601f3a9d38ba05d4e98a8ed8b707c93a40 /vl.c
parent7899f799b71ab502ddc2344e4e22265f3eb663c6 (diff)
downloadqemu-8e84865e54cb66fd7b57bb18c312ad3d56b6e276.zip
qemu-8e84865e54cb66fd7b57bb18c312ad3d56b6e276.tar.gz
qemu-8e84865e54cb66fd7b57bb18c312ad3d56b6e276.tar.bz2
migration: Accept 'cont' only after successful incoming migration
When a 'cont' is issued on a VM that's just waiting for an incoming migration, the VM reboots and boots into the guest, possibly corrupting its storage since it could be shared with another VM running elsewhere. Ensure that a VM started with '-incoming' is only run when an incoming migration successfully completes. A new qerror, QERR_MIGRATION_EXPECTED, is added to signal that 'cont' failed due to no incoming migration has been attempted yet. Reported-by: Laine Stump <laine@redhat.com> Signed-off-by: Amit Shah <amit.shah@redhat.com> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vl.c b/vl.c
index 1406831..b3e3676 100644
--- a/vl.c
+++ b/vl.c
@@ -182,6 +182,7 @@ int nb_nics;
NICInfo nd_table[MAX_NICS];
int vm_running;
int autostart;
+int incoming_expected; /* Started with -incoming and waiting for incoming */
static int rtc_utc = 1;
static int rtc_date_offset = -1; /* -1 means no change */
QEMUClock *rtc_clock;
@@ -2555,6 +2556,7 @@ int main(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_incoming:
incoming = optarg;
+ incoming_expected = true;
break;
case QEMU_OPTION_nodefaults:
default_serial = 0;