From patchwork Tue Oct 4 13:15:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 117618 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 291D5B6F65 for ; Wed, 5 Oct 2011 00:16:07 +1100 (EST) Received: from localhost ([::1]:57375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB4qo-0007an-Kw for incoming@patchwork.ozlabs.org; Tue, 04 Oct 2011 09:16:02 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB4qf-0007aR-OI for qemu-devel@nongnu.org; Tue, 04 Oct 2011 09:15:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RB4qb-0003GX-ML for qemu-devel@nongnu.org; Tue, 04 Oct 2011 09:15:53 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:48428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB4qb-0003GP-Di for qemu-devel@nongnu.org; Tue, 04 Oct 2011 09:15:49 -0400 Received: by wyh22 with SMTP id 22so546850wyh.4 for ; Tue, 04 Oct 2011 06:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=nPQTB/P95stCBxVHmtE3Q/8hLP5FAh8oG/xTlU0aSIY=; b=URGg3PSxVl3JKNbiYNBjv1rioNw5oVuP1YoI1/JS07dSzR7BJC2yriDz6DCkHNNvik pVDWxJWumZKY4sluYw2I2y+O7IPVQVW85WQkfhcpCwoxWFwHIA6BT92k17IWxcZO2uLb 5ENpPhOaS/a+8IUGgmwklHlWsaXCs5HYASRus= Received: by 10.227.13.84 with SMTP id b20mr1529402wba.13.1317734148209; Tue, 04 Oct 2011 06:15:48 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id ei2sm3573863wbb.25.2011.10.04.06.15.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 04 Oct 2011 06:15:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Oct 2011 15:15:40 +0200 Message-Id: <1317734140-18478-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317733839-18143-1-git-send-email-pbonzini@redhat.com> References: <1317733839-18143-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2] runstate: add more valid transitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 46f2447..ff37968 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 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 },