From patchwork Thu Jan 26 14:24:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 137945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE030B6F98 for ; Fri, 27 Jan 2012 02:07:40 +1100 (EST) Received: from localhost ([::1]:39067 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQIJ-00015m-4M for incoming@patchwork.ozlabs.org; Thu, 26 Jan 2012 09:27:19 -0500 Received: from eggs.gnu.org ([140.186.70.92]:59901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHX-00082c-9k for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqQHR-0001j2-Al for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHQ-0001io-SI for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:25 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0QEQNKm015041 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Jan 2012 09:26:23 -0500 Received: from dhcp-1-120.tlv.redhat.com (dhcp-4-39.tlv.redhat.com [10.35.4.39]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q0QEPnS2012411; Thu, 26 Jan 2012 09:26:21 -0500 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Thu, 26 Jan 2012 16:24:55 +0200 Message-Id: <1327587897-31192-10-git-send-email-owasserm@redhat.com> In-Reply-To: <1327587897-31192-1-git-send-email-owasserm@redhat.com> References: <1327587897-31192-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: blauwirbel@gmail.com, stefanha@gmail.com, Orit Wasserman , avi@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH v7 09/11] Add set_cachesize command 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 Change XBZRLE cache size in MB (the size should be a power of 2). Signed-off-by: Orit Wasserman --- hmp-commands.hx | 15 +++++++++++++++ hmp.c | 13 +++++++++++++ hmp.h | 1 + migration.c | 22 +++++++++++++++++++++- migration.h | 2 ++ qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 22 ++++++++++++++++++++++ 7 files changed, 87 insertions(+), 1 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index e6506fc..3b7255d 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -776,6 +776,21 @@ STEXI @item migrate_cancel @findex migrate_cancel Cancel the current VM migration. + +ETEXI + + { + .name = "migrate_set_cachesize", + .args_type = "value:o", + .params = "value", + .help = "set cache size (in MB) for XBZRLE migrations", + .mhandler.cmd = hmp_migrate_set_cachesize, + }, + +STEXI +@item migrate_set_cachesize @var{value} +@findex migrate_set_cache +Set cache size to @var{value} (in MB) for xbzrle migrations. ETEXI { diff --git a/hmp.c b/hmp.c index 9c41e50..9871292 100644 --- a/hmp.c +++ b/hmp.c @@ -694,6 +694,19 @@ void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict) qmp_migrate_set_downtime(value, NULL); } +void hmp_migrate_set_cachesize(Monitor *mon, const QDict *qdict) +{ + int64_t value = qdict_get_int(qdict, "value"); + Error *err = NULL; + + qmp_migrate_set_cachesize(value, &err); + if (err) { + monitor_printf(mon, "%s\n", error_get_pretty(err)); + error_free(err); + return; + } +} + void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict) { int64_t value = qdict_get_int(qdict, "value"); diff --git a/hmp.h b/hmp.h index fdb5b24..ad9f8db 100644 --- a/hmp.h +++ b/hmp.h @@ -50,6 +50,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict); void hmp_migrate_cancel(Monitor *mon, const QDict *qdict); void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict); +void hmp_migrate_set_cachesize(Monitor *mon, const QDict *qdict); void hmp_set_password(Monitor *mon, const QDict *qdict); void hmp_expire_password(Monitor *mon, const QDict *qdict); void hmp_eject(Monitor *mon, const QDict *qdict); diff --git a/migration.c b/migration.c index 94f9460..2d0cc28 100644 --- a/migration.c +++ b/migration.c @@ -166,7 +166,7 @@ MigrationCapList *qmp_query_migration_caps(Error **errp) MigrationCapList *caps_list = g_malloc0(sizeof(*caps_list)); caps_list->value = g_malloc(sizeof(*caps_list->value)); - caps_list->value->name = g_strdup("uleb"); + caps_list->value->name = g_strdup("xbzrle"); caps_list->next = NULL; return caps_list; @@ -494,6 +494,26 @@ void qmp_migrate_cancel(Error **errp) migrate_fd_cancel(migrate_get_current()); } +void qmp_migrate_set_cachesize(int64_t value, Error **errp) +{ + /* On 32-bit hosts, QEMU is limited by virtual address space */ + if (value > (2047 << 20) && HOST_LONG_BITS == 32) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", + "exceeding address space"); + return; + } + + /* power of 2 */ + if (value != 1 && (value & (value - 1))) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", + "needs to be power of 2"); + return; + } + + value = MIN(UINT64_MAX, value); + migrate_cache_size = value; +} + void qmp_migrate_set_speed(int64_t value, Error **errp) { MigrationState *s; diff --git a/migration.h b/migration.h index 7e1c7c0..4e53760 100644 --- a/migration.h +++ b/migration.h @@ -111,4 +111,6 @@ int decode_page(uint8_t *src, int slen, uint8_t *dst, int dlen); void arch_set_params(const MigrationParams *params, void *opaque); +void do_migrate_set_cachesize(Monitor *mon, const QDict *qdict); + #endif diff --git a/qapi-schema.json b/qapi-schema.json index 060b7e6..cb057d5 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1197,6 +1197,19 @@ { 'command': 'migrate_set_speed', 'data': {'value': 'int'} } ## +# @migrate_set_cachesize +# +# Set XBZRLE cache size +# +# @value: cache size in Mbytes +# +# Returns: nothing on success +# +# Since: 1.1 +## +{ 'command': 'migrate_set_cachesize', 'data': {'value': 'int'} } + +## # @DevicePropertyInfo: # # @name: the name of the property diff --git a/qmp-commands.hx b/qmp-commands.hx index e07d2c2..ad4e328 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -482,6 +482,28 @@ Example: <- { "return": {} } EQMP +{ + .name = "migrate_set_cachesize", + .args_type = "value:o", + .mhandler.cmd_new = qmp_marshal_input_migrate_set_cachesize, + }, + +SQMP +migrate_set_cachesize +--------------------- + +Set cache size to be used by XBZRLE migration + +Arguments: + +- "value": cache size in bytes (json-int) + +Example: + +-> { "execute": "migrate_set_cachesize", "arguments": { "value": 512 } } +<- { "return": {} } + +EQMP { .name = "migrate_set_speed",