From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49631) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RZ8Or-0007NT-JV for qemu-devel@nongnu.org; Fri, 09 Dec 2011 16:54:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RZ8Op-0003pD-Q6 for qemu-devel@nongnu.org; Fri, 09 Dec 2011 16:54:37 -0500 Received: from smtp.citrix.com ([66.165.176.89]:19043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RZ8Op-0003ol-ML for qemu-devel@nongnu.org; Fri, 09 Dec 2011 16:54:35 -0500 From: Anthony PERARD Date: Fri, 9 Dec 2011 21:54:03 +0000 Message-ID: <1323467645-24271-4-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1323467645-24271-1-git-send-email-anthony.perard@citrix.com> References: <1323467645-24271-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH V2 3/5] Introduce premigrate RunState. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Cc: Anthony PERARD , Xen Devel , Stefano Stabellini This new state will be used by Xen functions to know QEMU will wait for a migration. This is important to know for memory related function because the memory is already allocated and reallocated them will not works. Signed-off-by: Anthony PERARD --- qapi-schema.json | 2 +- vl.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index cb1ba77..bd77444 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -121,7 +121,7 @@ { 'enum': 'RunState', 'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', 'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm', - 'running', 'save-vm', 'shutdown', 'watchdog' ] } + 'running', 'save-vm', 'shutdown', 'watchdog', 'premigrate' ] } ## # @StatusInfo: diff --git a/vl.c b/vl.c index e7dced2..a291416 100644 --- a/vl.c +++ b/vl.c @@ -351,8 +351,11 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING }, { RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE }, + { RUN_STATE_PRELAUNCH, RUN_STATE_PREMIGRATE }, { RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE }, + { RUN_STATE_PREMIGRATE, RUN_STATE_INMIGRATE }, + { RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING }, { RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE }, @@ -2975,6 +2978,7 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_incoming: incoming = optarg; + runstate_set(RUN_STATE_PREMIGRATE); break; case QEMU_OPTION_nodefaults: default_serial = 0; -- Anthony PERARD