From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:44182)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1RDgVZ-00088v-Dg
	for qemu-devel@nongnu.org; Tue, 11 Oct 2011 13:52:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1RDgVY-0005oC-Ce
	for qemu-devel@nongnu.org; Tue, 11 Oct 2011 13:52:53 -0400
Received: from mx1.redhat.com ([209.132.183.28]:22978)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1RDgVY-0005n6-22
	for qemu-devel@nongnu.org; Tue, 11 Oct 2011 13:52:52 -0400
Received: from int-mx10.intmail.prod.int.phx2.redhat.com
	(int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9BHqooD004855
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Tue, 11 Oct 2011 13:52:51 -0400
Date: Tue, 11 Oct 2011 14:52:48 -0300
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20111011145248.4ef5e39b@doriath>
In-Reply-To: <1318317762-20956-1-git-send-email-pbonzini@redhat.com>
References: <20111010155013.0c1e40c4@doriath>
	<1318317762-20956-1-git-send-email-pbonzini@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2] runstate: add more valid transitions
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org

On Tue, 11 Oct 2011 09:22:42 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> 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 <pbonzini@redhat.com>

Applied to the qmp branch, thanks.

> ---
>  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 },
>