From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB4m9-00060s-Q1 for qemu-devel@nongnu.org; Tue, 04 Oct 2011 09:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RB4m8-0002V8-Rb for qemu-devel@nongnu.org; Tue, 04 Oct 2011 09:11:13 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:62925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB4m8-0002V3-JD for qemu-devel@nongnu.org; Tue, 04 Oct 2011 09:11:12 -0400 Received: by wyh22 with SMTP id 22so541361wyh.4 for ; Tue, 04 Oct 2011 06:11:11 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Oct 2011 15:10:39 +0200 Message-Id: <1317733839-18143-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] 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 | 11 ++++++++--- vl.c | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/savevm.c b/savevm.c index 46f2447..ba5beb0 100644 --- a/savevm.c +++ b/savevm.c @@ -1599,7 +1599,7 @@ void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f) static int qemu_savevm_state(Monitor *mon, QEMUFile *f) { - int saved_vm_running; + int saved_vm_state; int ret; saved_vm_running = runstate_is_running(); @@ -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 bd4a5ce..165712e 100644 --- a/vl.c +++ b/vl.c @@ -346,8 +346,12 @@ static const RunStateTransition runstate_transitions_def[] = { { RSTATE_IO_ERROR, RSTATE_RUNNING }, { RSTATE_PAUSED, RSTATE_RUNNING }, + { RSTATE_PAUSED, RSTATE_PRE_MIGRATE }, + { RSTATE_PAUSED, RSTATE_SAVEVM }, { RSTATE_POST_MIGRATE, RSTATE_RUNNING }, + { RSTATE_POST_MIGRATE, RSTATE_PRE_MIGRATE }, + { RSTATE_POST_MIGRATE, RSTATE_SAVEVM }, { RSTATE_PRE_LAUNCH, RSTATE_RUNNING }, { RSTATE_PRE_LAUNCH, RSTATE_POST_MIGRATE }, @@ -368,6 +372,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RSTATE_RUNNING, RSTATE_WATCHDOG }, { RSTATE_SAVEVM, RSTATE_RUNNING }, + { RSTATE_SAVEVM, RSTATE_PAUSED }, { RSTATE_SHUTDOWN, RSTATE_PAUSED }, -- 1.7.6