From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDWfu-00036q-PD for qemu-devel@nongnu.org; Tue, 11 Oct 2011 03:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDWfq-0002lN-QY for qemu-devel@nongnu.org; Tue, 11 Oct 2011 03:22:54 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDWfq-0002lJ-FZ for qemu-devel@nongnu.org; Tue, 11 Oct 2011 03:22:50 -0400 Received: by wwg14 with SMTP id 14so8546669wwg.10 for ; Tue, 11 Oct 2011 00:22:49 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 11 Oct 2011 09:22:42 +0200 Message-Id: <1318317762-20956-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <20111010155013.0c1e40c4@doriath> References: <20111010155013.0c1e40c4@doriath> Subject: [Qemu-devel] [PATCH v2] runstate: add more valid transitions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com This patch adds more valid transitions to the table, and avoids that the VM remains stuck in RSTATE_SAVEVM state when savevm is done on a paused virtual machine. Signed-off-by: Paolo Bonzini --- savevm.c | 9 +++++++-- vl.c | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/savevm.c b/savevm.c index bf4d0e7..ac45db8 100644 --- a/savevm.c +++ b/savevm.c @@ -1626,8 +1626,13 @@ out: if (qemu_file_has_error(f)) ret = -EIO; - if (!ret && saved_vm_running) - vm_start(); + if (!ret) { + if (saved_vm_running) { + vm_start(); + } else { + runstate_set(RSTATE_PAUSED); + } + } return ret; } diff --git a/vl.c b/vl.c index dbf7778..6614aac 100644 --- a/vl.c +++ b/vl.c @@ -343,8 +343,12 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_IO_ERROR, RUN_STATE_RUNNING }, { RUN_STATE_PAUSED, RUN_STATE_RUNNING }, + { RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE }, + { RUN_STATE_PAUSED, RUN_STATE_SAVE_VM }, { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING }, + { RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE }, + { RUN_STATE_POSTMIGRATE, RUN_STATE_SAVE_VM }, { RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING }, { RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE }, @@ -366,6 +370,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG }, { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING }, + { RUN_STATE_SAVE_VM, RUN_STATE_PAUSED }, { RUN_STATE_SHUTDOWN, RUN_STATE_PAUSED }, -- 1.7.6