From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOmBa-0001aF-UO for qemu-devel@nongnu.org; Thu, 18 Oct 2012 05:14:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOmBV-0006P4-5A for qemu-devel@nongnu.org; Thu, 18 Oct 2012 05:14:38 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:54274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOmBU-0006Oy-V6 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 05:14:33 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so8182494pad.4 for ; Thu, 18 Oct 2012 02:14:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 18 Oct 2012 11:14:22 +0200 Message-Id: <1350551662-18408-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] qmp: handle stop/cont in INMIGRATE state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Right now, stop followed by an incoming migration will let the virtual machine start. cont before an incoming migration instead will fail. This is bad because the actual behavior is not predictable; it is racy with respect to the start of the incoming migration. That's because incoming migration is blocking, and thus will delay the processing of stop/cont until the end of the migration. In addition, there's nothing that really prevents the user from typing the block device's passwords before incoming migration is done, so we may as well allow that. Both things can be fixed by just toggling the autostart variable when stop/cont are called in INMIGRATE state. Signed-off-by: Paolo Bonzini --- qmp.c | 17 +++++++++++------ 1 file modificato, 11 inserzioni(+), 6 rimozioni(-) diff --git a/qmp.c b/qmp.c index 36c54c5..2c8d559 100644 --- a/qmp.c +++ b/qmp.c @@ -85,7 +85,11 @@ void qmp_quit(Error **err) void qmp_stop(Error **errp) { - vm_stop(RUN_STATE_PAUSED); + if (runstate_check(RUN_STATE_INMIGRATE)) { + autostart = 0; + } else { + vm_stop(RUN_STATE_PAUSED); + } } void qmp_system_reset(Error **errp) @@ -144,10 +148,7 @@ void qmp_cont(Error **errp) { Error *local_err = NULL; - if (runstate_check(RUN_STATE_INMIGRATE)) { - error_set(errp, QERR_MIGRATION_EXPECTED); - return; - } else if (runstate_check(RUN_STATE_INTERNAL_ERROR) || + if (runstate_check(RUN_STATE_INTERNAL_ERROR) || runstate_check(RUN_STATE_SHUTDOWN)) { error_set(errp, QERR_RESET_REQUIRED); return; @@ -162,7 +163,11 @@ void qmp_cont(Error **errp) return; } - vm_start(); + if (runstate_check(RUN_STATE_INMIGRATE)) { + autostart = 1; + } else { + vm_start(); + } } void qmp_system_wakeup(Error **errp) -- 1.7.12.1