From patchwork Tue Sep 6 13:14:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 113564 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 625BDB6F69 for ; Tue, 6 Sep 2011 23:52:17 +1000 (EST) Received: from localhost ([::1]:36554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0vVG-00064A-NH for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2011 09:15:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0vUE-0002oF-PH for qemu-devel@nongnu.org; Tue, 06 Sep 2011 09:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0vU8-0001SY-3E for qemu-devel@nongnu.org; Tue, 06 Sep 2011 09:14:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0vU7-0001SS-PT for qemu-devel@nongnu.org; Tue, 06 Sep 2011 09:14:40 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p86DEd1F005589 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Sep 2011 09:14:39 -0400 Received: from localhost (ovpn-113-32.phx2.redhat.com [10.3.113.32]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p86DEcI3009148; Tue, 6 Sep 2011 09:14:38 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 6 Sep 2011 10:14:22 -0300 Message-Id: <1315314868-24770-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1315314868-24770-1-git-send-email-lcapitulino@redhat.com> References: <1315314868-24770-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, amit.shah@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH 3/9] RunState: Add additional states 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 Currently, only vm_start() and vm_stop() change the VM state. That's, the state is only changed when starting or stopping the VM. This commit adds the runstate_set() function, which makes it possible to also do state transitions when the VM is stopped or running. Additional states are also added and the current state is stored. Signed-off-by: Luiz Capitulino --- cpus.c | 1 + migration.c | 8 +++++++- sysemu.h | 9 ++++++++- vl.c | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index 76a79ac..3444bc0 100644 --- a/cpus.c +++ b/cpus.c @@ -124,6 +124,7 @@ static void do_vm_stop(RunState state) cpu_disable_ticks(); vm_running = 0; pause_all_vcpus(); + runstate_set(state); vm_state_notify(0, state); qemu_aio_flush(); bdrv_flush_all(); diff --git a/migration.c b/migration.c index 29f1a76..f2499cf 100644 --- a/migration.c +++ b/migration.c @@ -72,8 +72,11 @@ void process_incoming_migration(QEMUFile *f) incoming_expected = false; - if (autostart) + if (autostart) { vm_start(); + } else { + runstate_set(RSTATE_PRE_LAUNCH); + } } int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) @@ -390,6 +393,9 @@ void migrate_fd_put_ready(void *opaque) } state = MIG_STATE_ERROR; } + if (state == MIG_STATE_COMPLETED) { + runstate_set(RSTATE_POST_MIGRATE); + } s->state = state; notifier_list_notify(&migration_state_notifiers, NULL); } diff --git a/sysemu.h b/sysemu.h index a3846ca..19088aa 100644 --- a/sysemu.h +++ b/sysemu.h @@ -11,16 +11,21 @@ /* 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 */ RSTATE_IO_ERROR, /* paused due to an I/O error */ RSTATE_PAUSED, /* paused by the user (ie. the 'stop' command) */ + RSTATE_POST_MIGRATE, /* paused following a successful migration */ + RSTATE_PRE_LAUNCH, /* qemu was started with -S and haven't started */ RSTATE_PRE_MIGRATE, /* paused preparing to finish migrate */ RSTATE_RESTORE, /* paused restoring the VM state */ RSTATE_RUNNING, /* qemu is running */ RSTATE_SAVEVM, /* paused saving VM state */ RSTATE_SHUTDOWN, /* guest shut down and -no-shutdown is in use */ - RSTATE_WATCHDOG /* watchdog fired and qemu is configured to pause */ + RSTATE_WATCHDOG, /* watchdog fired and qemu is configured to pause */ + RSTATE_MAX } RunState; extern const char *bios_name; @@ -31,6 +36,8 @@ extern uint8_t qemu_uuid[]; int qemu_uuid_parse(const char *str, uint8_t *uuid); #define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" +bool runstate_check(RunState state); +void runstate_set(RunState new_state); typedef struct vm_change_state_entry VMChangeStateEntry; typedef void VMChangeStateHandler(void *opaque, int running, RunState state); diff --git a/vl.c b/vl.c index ca7d3c4..9926d2a 100644 --- a/vl.c +++ b/vl.c @@ -323,6 +323,22 @@ static int default_driver_check(QemuOpts *opts, void *opaque) } /***********************************************************/ +/* QEMU state */ + +static RunState current_run_state = RSTATE_NO_STATE; + +bool runstate_check(RunState state) +{ + return current_run_state == state; +} + +void runstate_set(RunState new_state) +{ + assert(new_state < RSTATE_MAX); + current_run_state = new_state; +} + +/***********************************************************/ /* real time host monotonic timer */ /***********************************************************/ @@ -1161,6 +1177,7 @@ void vm_start(void) if (!vm_running) { cpu_enable_ticks(); vm_running = 1; + runstate_set(RSTATE_RUNNING); vm_state_notify(1, RSTATE_RUNNING); resume_all_vcpus(); monitor_protocol_event(QEVENT_RESUME, NULL); @@ -3437,6 +3454,7 @@ int main(int argc, char **argv, char **envp) } if (incoming) { + runstate_set(RSTATE_IN_MIGRATE); int ret = qemu_start_incoming_migration(incoming); if (ret < 0) { fprintf(stderr, "Migration failed. Exit code %s(%d), exiting.\n", @@ -3445,6 +3463,8 @@ int main(int argc, char **argv, char **envp) } } else if (autostart) { vm_start(); + } else { + runstate_set(RSTATE_PRE_LAUNCH); } os_setup_post();