From patchwork Tue Oct 15 07:26:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jules Wang X-Patchwork-Id: 283529 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 04C392C00DC for ; Tue, 15 Oct 2013 18:28:10 +1100 (EST) Received: from localhost ([::1]:40334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVz31-0002NQ-Rz for incoming@patchwork.ozlabs.org; Tue, 15 Oct 2013 03:28:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVz2M-0002Hu-3R for qemu-devel@nongnu.org; Tue, 15 Oct 2013 03:27:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VVz2I-0005zj-9c for qemu-devel@nongnu.org; Tue, 15 Oct 2013 03:27:26 -0400 Received: from [2001:250:208:1181:6e92:bfff:fe00:bcdb] (port=60474 helo=mail.cs2c.com.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVz2H-0005yg-Ny for qemu-devel@nongnu.org; Tue, 15 Oct 2013 03:27:22 -0400 Received: from localhost.localdomain (cs2c.com.cn [127.0.0.1]) by mail.cs2c.com.cn (NSMail) with ESMTPA id BAB1FB80171; Tue, 15 Oct 2013 15:12:57 +0800 (CST) BANMAU_FRONT_USER_AUTHED: 1 BANMAU_FRONT_RESULT: 01 BANMAU_FRONT_SUSPICION_REASON: 0 X-Forward-For: 124.205.131.210 From: Jules Wang To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2013 15:26:21 +0800 Message-Id: <1381821983-13932-3-git-send-email-junqing.wang@cs2c.com.cn> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1381821983-13932-1-git-send-email-junqing.wang@cs2c.com.cn> References: <1381821983-13932-1-git-send-email-junqing.wang@cs2c.com.cn> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:250:208:1181:6e92:bfff:fe00:bcdb Cc: pbonzini@redhat.com, Jules Wang , owasserm@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH v3 2/4] Curling: cmdline interface. 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 Add an option '-f' to migration cmdline. Indicating whether to enable fault tolerant or not. Signed-off-by: Jules Wang --- hmp-commands.hx | 10 ++++++---- hmp.c | 3 ++- include/migration/migration.h | 1 + migration.c | 3 ++- qapi-schema.json | 6 +++++- qmp-commands.hx | 3 ++- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index caae5ad..e6fa3f7 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -877,23 +877,25 @@ ETEXI { .name = "migrate", - .args_type = "detach:-d,blk:-b,inc:-i,uri:s", - .params = "[-d] [-b] [-i] uri", + .args_type = "detach:-d,blk:-b,inc:-i,fault-tolerant:-f,uri:s", + .params = "[-d] [-b] [-i] [-f] uri", .help = "migrate to URI (using -d to not wait for completion)" "\n\t\t\t -b for migration without shared storage with" " full copy of disk\n\t\t\t -i for migration without " "shared storage with incremental copy of disk " - "(base image shared between src and destination)", + "(base image shared between src and destination)" + "\n\t\t\t -f for fault tolerant mode", .mhandler.cmd = hmp_migrate, }, STEXI -@item migrate [-d] [-b] [-i] @var{uri} +@item migrate [-d] [-b] [-i] [-f] @var{uri} @findex migrate Migrate to @var{uri} (using -d to not wait for completion). -b for migration with full copy of disk -i for migration with incremental copy of disk (base image is shared) + -f for fault tolerant mode ETEXI { diff --git a/hmp.c b/hmp.c index 5891507..623a3f0 100644 --- a/hmp.c +++ b/hmp.c @@ -1265,10 +1265,11 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) int detach = qdict_get_try_bool(qdict, "detach", 0); int blk = qdict_get_try_bool(qdict, "blk", 0); int inc = qdict_get_try_bool(qdict, "inc", 0); + int ft = qdict_get_try_bool(qdict, "fault-tolerant", 0); const char *uri = qdict_get_str(qdict, "uri"); Error *err = NULL; - qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, &err); + qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, !!ft, ft, &err); if (err) { monitor_printf(mon, "migrate: %s\n", error_get_pretty(err)); error_free(err); diff --git a/include/migration/migration.h b/include/migration/migration.h index 140e6b4..fc2b066 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -25,6 +25,7 @@ struct MigrationParams { bool blk; + bool ft; bool shared; }; diff --git a/migration.c b/migration.c index 2b1ab20..08dcca0 100644 --- a/migration.c +++ b/migration.c @@ -395,7 +395,7 @@ void migrate_del_blocker(Error *reason) void qmp_migrate(const char *uri, bool has_blk, bool blk, bool has_inc, bool inc, bool has_detach, bool detach, - Error **errp) + bool has_ft, bool ft, Error **errp) { Error *local_err = NULL; MigrationState *s = migrate_get_current(); @@ -404,6 +404,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, params.blk = has_blk && blk; params.shared = has_inc && inc; + params.ft = has_ft && ft; if (s->state == MIG_STATE_ACTIVE || s->state == MIG_STATE_SETUP) { error_set(errp, QERR_MIGRATION_ACTIVE); diff --git a/qapi-schema.json b/qapi-schema.json index 60f3fd1..49dd5ff 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2594,12 +2594,16 @@ # @detach: this argument exists only for compatibility reasons and # is ignored by QEMU # +# @fault-tolerant: #optional true to enable fault tolerant +# (since 1.7) +# # Returns: nothing on success # # Since: 0.14.0 ## { 'command': 'migrate', - 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } } + 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool', + '*fault-tolerant': 'bool' } } # @xen-save-devices-state: # diff --git a/qmp-commands.hx b/qmp-commands.hx index fba15cd..ff13baf 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -611,7 +611,7 @@ EQMP { .name = "migrate", - .args_type = "detach:-d,blk:-b,inc:-i,uri:s", + .args_type = "detach:-d,blk:-b,inc:-i,fault-tolerant:-f,uri:s", .mhandler.cmd_new = qmp_marshal_input_migrate, }, @@ -625,6 +625,7 @@ Arguments: - "blk": block migration, full disk copy (json-bool, optional) - "inc": incremental disk copy (json-bool, optional) +- "fault-tolerant": fault tolerant (json-bool, optional) - "uri": Destination URI (json-string) Example: