From patchwork Wed Aug 1 18:01:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 174572 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 C9C5E2C0084 for ; Thu, 2 Aug 2012 04:38:54 +1000 (EST) Received: from localhost ([::1]:48137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwdNt-0003yR-3H for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 14:11:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwdNO-0002U9-Ak for qemu-devel@nongnu.org; Wed, 01 Aug 2012 14:10:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwdNL-0007jR-Vf for qemu-devel@nongnu.org; Wed, 01 Aug 2012 14:10:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwdNL-0007jA-Np for qemu-devel@nongnu.org; Wed, 01 Aug 2012 14:10:27 -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 q71IA7pW018408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 1 Aug 2012 14:10:27 -0400 Received: from trasno.mitica (ovpn-116-53.ams2.redhat.com [10.36.116.53]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q71I1KWI015897; Wed, 1 Aug 2012 14:01:22 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 1 Aug 2012 20:01:09 +0200 Message-Id: <1343844079-2949-2-git-send-email-quintela@redhat.com> In-Reply-To: <1343844079-2949-1-git-send-email-quintela@redhat.com> References: <1343844079-2949-1-git-send-email-quintela@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: Orit Wasserman Subject: [Qemu-devel] [PATCH 01/11] Add migration capabilities 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 From: Orit Wasserman Add migration capabilities that can be queried by the management using query-migration-supported-capabilities command. The management can query the source QEMU and the destination QEMU in order to verify both support some migration capability (currently only XBZRLE). Signed-off-by: Orit Wasserman Signed-off-by: Juan Quintela --- hmp-commands.hx | 2 ++ hmp.c | 21 +++++++++++++++++++++ hmp.h | 1 + migration.c | 12 ++++++++++++ monitor.c | 7 +++++++ qapi-schema.json | 39 +++++++++++++++++++++++++++++++++++++++ qmp-commands.hx | 25 +++++++++++++++++++++++++ 7 files changed, 107 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index eea8b32..8267237 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1417,6 +1417,8 @@ show CPU statistics show user network stack connection states @item info migrate show migration status +@item info migration_supported_capabilities +show migration supported capabilities @item info balloon show balloon information @item info qtree diff --git a/hmp.c b/hmp.c index 6b72a64..2ff71a3 100644 --- a/hmp.c +++ b/hmp.c @@ -161,6 +161,27 @@ void hmp_info_migrate(Monitor *mon) qapi_free_MigrationInfo(info); } +void hmp_info_migration_supported_capabilities(Monitor *mon) +{ + MigrationCapabilityStatusList *caps_list, *cap; + + caps_list = qmp_query_migration_supported_capabilities(NULL); + if (!caps_list) { + monitor_printf(mon, "No supported migration capabilities found\n"); + return; + } + + for (cap = caps_list; cap; cap = cap->next) { + monitor_printf(mon, "%s: %s ", + MigrationCapability_lookup[cap->value->capability], + cap->value->state ? "on" : "off"); + } + + monitor_printf(mon, "\n"); + + qapi_free_MigrationCapabilityStatusList(caps_list); +} + void hmp_info_cpus(Monitor *mon) { CpuInfoList *cpu_list, *cpu; diff --git a/hmp.h b/hmp.h index 8d2b0d7..8442c22 100644 --- a/hmp.h +++ b/hmp.h @@ -25,6 +25,7 @@ void hmp_info_uuid(Monitor *mon); void hmp_info_chardev(Monitor *mon); void hmp_info_mice(Monitor *mon); void hmp_info_migrate(Monitor *mon); +void hmp_info_migration_supported_capabilities(Monitor *mon); void hmp_info_cpus(Monitor *mon); void hmp_info_block(Monitor *mon); void hmp_info_blockstats(Monitor *mon); diff --git a/migration.c b/migration.c index 8db1b43..35444f7 100644 --- a/migration.c +++ b/migration.c @@ -166,6 +166,18 @@ MigrationInfo *qmp_query_migrate(Error **errp) return info; } +MigrationCapabilityStatusList * +qmp_query_migration_supported_capabilities(Error **errp) +{ + MigrationCapabilityStatusList *caps_list = g_malloc0(sizeof(*caps_list)); + + caps_list->value = g_malloc(sizeof(*caps_list->value)); + caps_list->value->capability = MIGRATION_CAPABILITY_XBZRLE; + caps_list->next = NULL; + + return caps_list; +} + /* shared migration helpers */ static int migrate_fd_cleanup(MigrationState *s) diff --git a/monitor.c b/monitor.c index 49dccfe..bb55168 100644 --- a/monitor.c +++ b/monitor.c @@ -2655,6 +2655,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.info = hmp_info_migrate, }, { + .name = "migration_supported_capabilities", + .args_type = "", + .params = "", + .help = "show migration supported capabilities", + .mhandler.info = hmp_info_migration_supported_capabilities, + }, + { .name = "balloon", .args_type = "", .params = "", diff --git a/qapi-schema.json b/qapi-schema.json index bc55ed2..9d4107b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -306,6 +306,45 @@ { 'command': 'query-migrate', 'returns': 'MigrationInfo' } ## +# @MigrationCapability +# +# Migration capabilities enumeration +# +# @xbzrle: Migration supports xbzrle (Xor Based Zero Run Length Encoding). +# This feature allows us to minimize migration traffic for certain work +# loads, by sending compressed difference of the pages +# +# Since: 1.2 +## +{ 'enum': 'MigrationCapability', + 'data': ['xbzrle'] } + +## +# @MigrationCapabilityStatus +# +# Migration capability information +# +# @capability: capability enum +# +# @state: capability state bool +# +# Since: 1.2 +## +{ 'type': 'MigrationCapabilityStatus', + 'data': { 'capability' : 'MigrationCapability', 'state' : 'bool' } } + +## +# @query-migration-supported-capabilities +# +# Returns information about current migration process capabilities. +# +# Returns: @MigrationCapabilityStatus list +# +# Since: 1.2 +## +{ 'command': 'query-migration-supported-capabilities', 'returns': ['MigrationCapabilityStatus'] } + +## # @MouseInfo: # # Information about a mouse device. diff --git a/qmp-commands.hx b/qmp-commands.hx index e3cf3c5..16fbcef 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2141,6 +2141,31 @@ EQMP }, SQMP +query-migration-supported-capabilities +------- + +Query migration supported capabilities + +- "xbzrle": xbzrle support + +Arguments: + +Example: + +-> { "execute": "query-migration-supported-capabilities"} +<- { "return": [ { "capability": "xbzrle", "state": true }, + { "capability": "foobar", "state": false } ] } + +EQMP + + { + .name = "query-migration-supported-capabilities", + .args_type = "", + .mhandler.cmd_new = + qmp_marshal_input_query_migration_supported_capabilities, + }, + +SQMP query-balloon -------------