From patchwork Fri Sep 30 20:34:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 117223 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 0BADCB6F75 for ; Sat, 1 Oct 2011 07:45:27 +1000 (EST) Received: from localhost ([::1]:57689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9jp2-0001gk-MB for incoming@patchwork.ozlabs.org; Fri, 30 Sep 2011 16:36:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9jnr-0007i3-J3 for qemu-devel@nongnu.org; Fri, 30 Sep 2011 16:35:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R9jnq-0008D9-77 for qemu-devel@nongnu.org; Fri, 30 Sep 2011 16:35:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9jnp-0008D1-Pp for qemu-devel@nongnu.org; Fri, 30 Sep 2011 16:35:26 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8UKZOIs010620 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Sep 2011 16:35:24 -0400 Received: from localhost (ovpn-113-111.phx2.redhat.com [10.3.113.111]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8UKZNVH021284; Fri, 30 Sep 2011 16:35:23 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 30 Sep 2011 17:34:42 -0300 Message-Id: <1317414891-4042-18-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1317414891-4042-1-git-send-email-lcapitulino@redhat.com> References: <1317414891-4042-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 17/26] RunState: Drop the RSTATE_NO_STATE value 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 The QAPI framework won't generate it, so we need to get rid of it. In order to do that, this commit makes RSTATE_PRE_LAUNCH the initial state and change qemu_vmstop_requested() to use RSTATE_MAX. Signed-off-by: Luiz Capitulino --- sysemu.h | 1 - vl.c | 19 +++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sysemu.h b/sysemu.h index 43ff546..41ccc02 100644 --- a/sysemu.h +++ b/sysemu.h @@ -11,7 +11,6 @@ /* vl.c */ typedef enum { - RSTATE_NO_STATE, RSTATE_DEBUG, /* qemu is running under gdb */ RSTATE_IN_MIGRATE, /* paused waiting for an incoming migration */ RSTATE_PANICKED, /* paused due to an internal error */ diff --git a/vl.c b/vl.c index 4db58bd..bc61494 100644 --- a/vl.c +++ b/vl.c @@ -323,7 +323,7 @@ static int default_driver_check(QemuOpts *opts, void *opaque) /***********************************************************/ /* QEMU state */ -static RunState current_run_state = RSTATE_NO_STATE; +static RunState current_run_state = RSTATE_PRE_LAUNCH; typedef struct { RunState from; @@ -332,10 +332,6 @@ typedef struct { static const RunStateTransition runstate_transitions_def[] = { /* from -> to */ - { RSTATE_NO_STATE, RSTATE_RUNNING }, - { RSTATE_NO_STATE, RSTATE_IN_MIGRATE }, - { RSTATE_NO_STATE, RSTATE_PRE_LAUNCH }, - { RSTATE_DEBUG, RSTATE_RUNNING }, { RSTATE_IN_MIGRATE, RSTATE_RUNNING }, @@ -350,6 +346,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RSTATE_POST_MIGRATE, RSTATE_RUNNING }, { RSTATE_PRE_LAUNCH, RSTATE_RUNNING }, + { RSTATE_PRE_LAUNCH, RSTATE_IN_MIGRATE }, { RSTATE_PRE_LAUNCH, RSTATE_POST_MIGRATE }, { RSTATE_PRE_MIGRATE, RSTATE_RUNNING }, @@ -424,8 +421,7 @@ void runstate_set(RunState new_state) const char *runstate_as_string(void) { - assert(current_run_state > RSTATE_NO_STATE && - current_run_state < RSTATE_MAX); + assert(current_run_state < RSTATE_MAX); return runstate_name_tbl[current_run_state]; } @@ -1294,7 +1290,7 @@ static int shutdown_requested, shutdown_signal = -1; static pid_t shutdown_pid; static int powerdown_requested; static int debug_requested; -static RunState vmstop_requested = RSTATE_NO_STATE; +static RunState vmstop_requested = RSTATE_MAX; int qemu_shutdown_requested_get(void) { @@ -1350,11 +1346,12 @@ static int qemu_debug_requested(void) return r; } +/* We use RSTATE_MAX but any invalid value will do */ static bool qemu_vmstop_requested(RunState *r) { - if (vmstop_requested != RSTATE_NO_STATE) { + if (vmstop_requested < RSTATE_MAX) { *r = vmstop_requested; - vmstop_requested = RSTATE_NO_STATE; + vmstop_requested = RSTATE_MAX; return true; } @@ -3569,8 +3566,6 @@ int main(int argc, char **argv, char **envp) } } else if (autostart) { vm_start(); - } else { - runstate_set(RSTATE_PRE_LAUNCH); } os_setup_post();