From patchwork Wed Dec 12 06:13:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 205436 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 43A212C0147 for ; Wed, 12 Dec 2012 17:14:41 +1100 (EST) Received: from localhost ([::1]:52184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TifaY-0005vw-Ut for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2012 01:14:38 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tifa6-0005YH-J8 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 01:14:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TifZz-0004CK-U5 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 01:14:10 -0500 Received: from [222.73.24.84] (port=27930 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TifZz-0004By-Bb for qemu-devel@nongnu.org; Wed, 12 Dec 2012 01:14:03 -0500 X-IronPort-AV: E=Sophos;i="4.84,264,1355068800"; d="scan'208";a="6380971" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 12 Dec 2012 14:12:04 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qBC6FwXZ016241; Wed, 12 Dec 2012 14:15:58 +0800 Received: from localhost.localdomain ([10.167.225.29]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012121214130507-369279 ; Wed, 12 Dec 2012 14:13:05 +0800 From: Hu Tao To: kvm list , qemu-devel , "linux-kernel@vger.kernel.org" , Avi Kivity , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Jan Kiszka , Gleb Natapov , Blue Swirl , Eric Blake , Andrew Jones , Marcelo Tosatti , Sasha Levin , Luiz Capitulino Date: Wed, 12 Dec 2012 14:13:44 +0800 Message-Id: <82c48bf2db6be635c24bc96b02e74d1aa1a2f9d5.1355290850.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.8.0.1.240.ge8a1f5a In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/12 14:13:05, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/12 14:13:05, Serialize complete at 2012/12/12 14:13:05 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [PATCH v12 1/8] save/load cpu runstate 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 Signed-off-by: Hu Tao --- migration.c | 6 +----- monitor.c | 5 ++--- savevm.c | 1 + sysemu.h | 2 ++ vl.c | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 40 insertions(+), 8 deletions(-) diff --git a/migration.c b/migration.c index 73ce170..31fa300 100644 --- a/migration.c +++ b/migration.c @@ -102,11 +102,7 @@ static void process_incoming_migration_co(void *opaque) /* Make sure all file formats flush their mutable metadata */ bdrv_invalidate_cache_all(); - if (autostart) { - vm_start(); - } else { - runstate_set(RUN_STATE_PAUSED); - } + load_run_state(); } static void enter_migration_coroutine(void *opaque) diff --git a/monitor.c b/monitor.c index c0e32d6..1226501 100644 --- a/monitor.c +++ b/monitor.c @@ -2067,13 +2067,12 @@ void qmp_closefd(const char *fdname, Error **errp) static void do_loadvm(Monitor *mon, const QDict *qdict) { - int saved_vm_running = runstate_is_running(); const char *name = qdict_get_str(qdict, "name"); vm_stop(RUN_STATE_RESTORE_VM); - if (load_vmstate(name) == 0 && saved_vm_running) { - vm_start(); + if (load_vmstate(name) == 0) { + load_run_state(); } } diff --git a/savevm.c b/savevm.c index 5d04d59..98963a4 100644 --- a/savevm.c +++ b/savevm.c @@ -2149,6 +2149,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) } saved_vm_running = runstate_is_running(); + save_run_state(); vm_stop(RUN_STATE_SAVE_VM); memset(sn, 0, sizeof(*sn)); diff --git a/sysemu.h b/sysemu.h index f5ac664..618f55e 100644 --- a/sysemu.h +++ b/sysemu.h @@ -19,6 +19,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" +void save_run_state(void); +void load_run_state(void); bool runstate_check(RunState state); void runstate_set(RunState new_state); int runstate_is_running(void); diff --git a/vl.c b/vl.c index c8e9c78..6f274cc 100644 --- a/vl.c +++ b/vl.c @@ -331,6 +331,7 @@ static int default_driver_check(QemuOpts *opts, void *opaque) /* QEMU state */ static RunState current_run_state = RUN_STATE_PRELAUNCH; +static RunState saved_run_state = RUN_STATE_PRELAUNCH; typedef struct { RunState from; @@ -354,6 +355,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE }, { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING }, + { RUN_STATE_POSTMIGRATE, RUN_STATE_PAUSED }, { RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE }, { RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING }, @@ -364,6 +366,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE }, { RUN_STATE_RESTORE_VM, RUN_STATE_RUNNING }, + { RUN_STATE_RESTORE_VM, RUN_STATE_PAUSED }, { RUN_STATE_RUNNING, RUN_STATE_DEBUG }, { RUN_STATE_RUNNING, RUN_STATE_INTERNAL_ERROR }, @@ -393,11 +396,39 @@ static const RunStateTransition runstate_transitions_def[] = { static bool runstate_valid_transitions[RUN_STATE_MAX][RUN_STATE_MAX]; +void save_run_state(void) +{ + saved_run_state = current_run_state; +} + +void load_run_state(void) +{ + if (saved_run_state == RUN_STATE_RUNNING) { + vm_start(); + } else if (!runstate_check(saved_run_state)) { + runstate_set(saved_run_state); + } else { + ; /* leave unchanged */ + } +} + bool runstate_check(RunState state) { return current_run_state == state; } +static void runstate_save(QEMUFile *f, void *opaque) +{ + qemu_put_byte(f, saved_run_state); +} + +static int runstate_load(QEMUFile *f, void *opaque, int version_id) +{ + saved_run_state = qemu_get_byte(f); + + return 0; +} + static void runstate_init(void) { const RunStateTransition *p; @@ -407,6 +438,9 @@ static void runstate_init(void) for (p = &runstate_transitions_def[0]; p->from != RUN_STATE_MAX; p++) { runstate_valid_transitions[p->from][p->to] = true; } + + register_savevm(NULL, "runstate", 0, 1, + runstate_save, runstate_load, NULL); } /* This function will abort() on invalid state transitions */