From patchwork Tue May 8 17:50:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 157761 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 45770B6FA5 for ; Wed, 9 May 2012 03:50:46 +1000 (EST) Received: from localhost ([::1]:44810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRoYe-00046m-2o for incoming@patchwork.ozlabs.org; Tue, 08 May 2012 13:50:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRoYH-0003ra-Md for qemu-devel@nongnu.org; Tue, 08 May 2012 13:50:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SRoYB-0002aA-FL for qemu-devel@nongnu.org; Tue, 08 May 2012 13:50:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRoYB-0002Zo-6C for qemu-devel@nongnu.org; Tue, 08 May 2012 13:50:15 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q48HoDT3026988 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 8 May 2012 13:50:13 -0400 Received: from localhost (ovpn-116-16.ams2.redhat.com [10.36.116.16]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q48HoBxS012373; Tue, 8 May 2012 13:50:12 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Tue, 8 May 2012 14:50:14 -0300 Message-Id: <1336499418-12722-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1336499418-12722-1-git-send-email-lcapitulino@redhat.com> References: <1336499418-12722-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 2/6] qapi-schema.json: fix RunState enums alphabetical order 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: Luiz Capitulino --- qapi-schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 4279259..33f2f92 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -92,6 +92,8 @@ # # @debug: QEMU is running on a debugger # +# @finish-migrate: guest is paused to finish the migration process +# # @inmigrate: guest is paused waiting for an incoming migration # # @internal-error: An internal error that prevents further guest execution @@ -106,8 +108,6 @@ # # @prelaunch: QEMU was started with -S and guest has not started # -# @finish-migrate: guest is paused to finish the migration process -# # @restore-vm: guest is paused to restore VM state # # @running: guest is actively running