From patchwork Thu Jan 26 14:24: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: 137947 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 CDF261007D2 for ; Fri, 27 Jan 2012 02:16:52 +1100 (EST) Received: from localhost ([::1]:37961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHs-0000UO-A2 for incoming@patchwork.ozlabs.org; Thu, 26 Jan 2012 09:26:52 -0500 Received: from eggs.gnu.org ([140.186.70.92]:59855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHO-0007Xf-0M for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqQHL-0001hJ-RU for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHL-0001hC-KH for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:19 -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 q0QEQHgp006259 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Jan 2012 09:26:17 -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 q0QEPnS0012411; Thu, 26 Jan 2012 09:26:15 -0500 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Thu, 26 Jan 2012 16:24:53 +0200 Message-Id: <1327587897-31192-8-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 07/11] Add XBZRLE parameters to MigrationState 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: Orit Wasserman --- arch_init.c | 5 +++++ migration.c | 8 ++++++++ migration.h | 4 ++++ savevm.c | 9 ++++++--- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/arch_init.c b/arch_init.c index 4ebf080..f864585 100644 --- a/arch_init.c +++ b/arch_init.c @@ -179,6 +179,11 @@ typedef struct ArchMigrationState { static ArchMigrationState arch_mig_state; +void arch_set_params(const MigrationParams *params, void *opaque) +{ + arch_mig_state.use_xbzrle = params->use_xbzrle; + arch_mig_state.xbzrle_cache_size = params->xbzrle_cache_size; +} /***********************************************************/ /* XBRLE page cache implementation */ static CacheItem *cache_item_get(unsigned long pos, int item) diff --git a/migration.c b/migration.c index c90740a..ce039e3 100644 --- a/migration.c +++ b/migration.c @@ -43,6 +43,11 @@ enum { #define MAX_THROTTLE (32 << 20) /* Migration speed throttling */ +/* Migration XBZRLE cache size */ +#define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024) + +static int64_t migrate_cache_size = DEFAULT_MIGRATE_CACHE_SIZE; + static NotifierList migration_state_notifiers = NOTIFIER_LIST_INITIALIZER(migration_state_notifiers); @@ -425,6 +430,9 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) params.blk = qdict_get_try_bool(qdict, "blk", 0); params.shared = qdict_get_try_bool(qdict, "inc", 0); + params.use_xbzrle = qdict_get_try_bool(qdict, "xbzrle", 0); + params.xbzrle_cache_size = migrate_cache_size; + if (s->state == MIG_STATE_ACTIVE) { monitor_printf(mon, "migration already in progress\n"); return -1; diff --git a/migration.h b/migration.h index 6362136..7e1c7c0 100644 --- a/migration.h +++ b/migration.h @@ -22,6 +22,8 @@ struct MigrationParams { int blk; int shared; + int use_xbzrle; + int64_t xbzrle_cache_size; }; typedef struct MigrationState MigrationState; @@ -107,4 +109,6 @@ int encode_page(uint8_t *old_buf, uint8_t *new_buf, int slen, uint8_t *dst, int dlen); int decode_page(uint8_t *src, int slen, uint8_t *dst, int dlen); +void arch_set_params(const MigrationParams *params, void *opaque); + #endif diff --git a/savevm.c b/savevm.c index 2d36d0c..bb93429 100644 --- a/savevm.c +++ b/savevm.c @@ -1278,7 +1278,8 @@ int register_savevm(DeviceState *dev, void *opaque) { return register_savevm_live(dev, idstr, instance_id, version_id, - NULL, NULL, save_state, load_state, opaque); + arch_set_params, NULL, save_state, + load_state, opaque); } void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque) @@ -1566,7 +1567,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, } se->set_params(params, se->opaque); } - + qemu_put_be32(f, QEMU_VM_FILE_MAGIC); qemu_put_be32(f, QEMU_VM_FILE_VERSION); @@ -1704,7 +1705,9 @@ static int qemu_savevm_state(Monitor *mon, QEMUFile *f) int ret; MigrationParams params = { .blk = 0, - .shared = 0 + .shared = 0, + .use_xbzrle = 0, + .xbzrle_cache_size = 0 }; if (qemu_savevm_state_blocked(mon)) {