From patchwork Sun Jul 29 09:42:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 173906 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 6AD102C008C for ; Sun, 29 Jul 2012 19:43:29 +1000 (EST) Received: from localhost ([::1]:42635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvQ23-00042y-EG for incoming@patchwork.ozlabs.org; Sun, 29 Jul 2012 05:43:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvQ1o-0003uR-7C for qemu-devel@nongnu.org; Sun, 29 Jul 2012 05:43:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SvQ1m-0000nh-Jc for qemu-devel@nongnu.org; Sun, 29 Jul 2012 05:43:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvQ1m-0000nU-BX for qemu-devel@nongnu.org; Sun, 29 Jul 2012 05:43:10 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6T9h0ce007597 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 29 Jul 2012 05:43:00 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-201-182.tlv.redhat.com [10.35.201.182]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6T9gpLG028160; Sun, 29 Jul 2012 05:42:56 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Sun, 29 Jul 2012 12:42:53 +0300 Message-Id: <1343554983-4195-2-git-send-email-owasserm@redhat.com> In-Reply-To: <1343554983-4195-1-git-send-email-owasserm@redhat.com> References: <1343554983-4195-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, blauwirbel@gmail.com, Orit Wasserman , chegu_vinod@hp.com, avi@redhat.com, pbonzini@redhat.com, eblake@redhat.com 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 Add migration capabilities that can be queried by the management. 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 Reviewed-by: Eric Blake --- hmp-commands.hx | 2 ++ hmp.c | 19 +++++++++++++++++++ hmp.h | 1 + migration.c | 11 +++++++++++ monitor.c | 7 +++++++ qapi-schema.json | 39 +++++++++++++++++++++++++++++++++++++++ qmp-commands.hx | 24 ++++++++++++++++++++++++ 7 files changed, 103 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index eea8b32..8786148 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_capabilities +show migration capabilities @item info balloon show balloon information @item info qtree diff --git a/hmp.c b/hmp.c index 6b72a64..5c7d0be 100644 --- a/hmp.c +++ b/hmp.c @@ -161,6 +161,25 @@ void hmp_info_migrate(Monitor *mon) qapi_free_MigrationInfo(info); } +void hmp_info_migration_capabilities(Monitor *mon) +{ + MigrationCapabilityStatusList *caps_list, *cap; + + caps_list = qmp_query_migration_capabilities(NULL); + if (!caps_list) { + monitor_printf(mon, "No 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"); + } + + 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..2fb44ca 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_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..8c27347 100644 --- a/migration.c +++ b/migration.c @@ -166,6 +166,17 @@ MigrationInfo *qmp_query_migrate(Error **errp) return info; } +MigrationCapabilityStatusList *qmp_query_migration_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 09aa3cd..fd57c5e 100644 --- a/monitor.c +++ b/monitor.c @@ -2662,6 +2662,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.info = hmp_info_migrate, }, { + .name = "migration-capabilities", + .args_type = "", + .params = "", + .help = "show migration capabilities", + .mhandler.info = hmp_info_migration_capabilities, + }, + { .name = "balloon", .args_type = "", .params = "", diff --git a/qapi-schema.json b/qapi-schema.json index a92adb1..b4d4dd6 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 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-capabilities +# +# Returns information about current migration process capabilities. +# +# Returns: @MigrationCapabilityStatus list +# +# Since: 1.2 +## +{ 'command': 'query-migration-capabilities', 'returns': ['MigrationCapabilityStatus'] } + +## # @MouseInfo: # # Information about a mouse device. diff --git a/qmp-commands.hx b/qmp-commands.hx index e3cf3c5..c0ed14c 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2141,6 +2141,30 @@ EQMP }, SQMP +query-migration-capabilities +------- + +Query migration capabilities + +- "xbzrle": xbzrle support + +Arguments: + +Example: + +-> { "execute": "query-migration-capabilities"} +<- { "return": [ { "capability": "xbzrle", "state": true }, + { "capability": "foobar", "state": false } ] } + +EQMP + + { + .name = "query-migration-capabilities", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_migration_capabilities, + }, + +SQMP query-balloon -------------