From patchwork Fri Sep 23 12:57:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 116093 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 C8F561007D3 for ; Sat, 24 Sep 2011 00:29:15 +1000 (EST) Received: from localhost ([::1]:51442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R75LR-0003ff-8A for incoming@patchwork.ozlabs.org; Fri, 23 Sep 2011 08:59:09 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R75KQ-0001ot-Ho for qemu-devel@nongnu.org; Fri, 23 Sep 2011 08:58:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R75KP-0004uV-Al for qemu-devel@nongnu.org; Fri, 23 Sep 2011 08:58:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R75KO-0004uC-Pj for qemu-devel@nongnu.org; Fri, 23 Sep 2011 08:58:05 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8NCw38v006055 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 23 Sep 2011 08:58:03 -0400 Received: from neno.neno (ovpn-116-44.ams2.redhat.com [10.36.116.44]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8NCvZls021572; Fri, 23 Sep 2011 08:58:02 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 23 Sep 2011 14:57:07 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 18/23] migration: Use bandwidth_limit directly 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 Now that current_migration always exist, there is no reason for max_throotle variable. Signed-off-by: Juan Quintela --- migration.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/migration.c b/migration.c index c382383..ea50a6f 100644 --- a/migration.c +++ b/migration.c @@ -31,14 +31,14 @@ do { } while (0) #endif -/* Migration speed throttling */ -static int64_t max_throttle = (32 << 20); +#define MAX_THROTTLE (32 << 20) /* Migration speed throttling */ /* When we add fault tolerance, we could have several migrations at once. For now we don't need to add dynamic creation of migration */ static MigrationState current_migration_static = { .state = MIG_STATE_NONE, + .bandwidth_limit = MAX_THROTTLE, }; static MigrationState *current_migration = ¤t_migration_static; @@ -385,14 +385,14 @@ void migrate_fd_connect(MigrationState *s) migrate_fd_put_ready(s); } -static void migrate_init_state(Monitor *mon, int64_t bandwidth_limit, - int detach, int blk, int inc) +static void migrate_init_state(Monitor *mon, int detach, int blk, int inc) { + int64_t bandwidth_limit = current_migration->bandwidth_limit; + memset(current_migration, 0, sizeof(current_migration)); + current_migration->bandwidth_limit = bandwidth_limit; current_migration->blk = blk; current_migration->shared = inc; - current_migration->mon = NULL; - current_migration->bandwidth_limit = bandwidth_limit; current_migration->state = MIG_STATE_NONE; if (!detach) { @@ -418,7 +418,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) return -1; } - migrate_init_state(mon, max_throttle, detach, blk, inc); + migrate_init_state(mon, detach, blk, inc); if (strstart(uri, "tcp:", &p)) { ret = tcp_start_outgoing_migration(current_migration, p); @@ -458,9 +458,10 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) if (d < 0) { d = 0; } - max_throttle = d; + current_migration->bandwidth_limit = d; - qemu_file_set_rate_limit(current_migration->file, max_throttle); + qemu_file_set_rate_limit(current_migration->file, + current_migration->bandwidth_limit); return 0; }