From patchwork Tue Sep 20 14:19:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 115554 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 64977B6F9B for ; Wed, 21 Sep 2011 00:21:59 +1000 (EST) Received: from localhost ([::1]:34081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61Cl-0007Tw-7X for incoming@patchwork.ozlabs.org; Tue, 20 Sep 2011 10:21:47 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61BW-0005IY-LQ for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R61BP-0008Ds-0D for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56561) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61BO-0008DZ-KT for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:22 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8KEKLhk031913 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Sep 2011 10:20:21 -0400 Received: from trasno.mitica (ovpn-113-56.phx2.redhat.com [10.3.113.56]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8KEJv9l015328; Tue, 20 Sep 2011 10:20:20 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 20 Sep 2011 16:19:46 +0200 Message-Id: <21cacfc9220f06aacbe5ed407e768a2fba1911b9.1316526970.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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 is static, there is no reason for max_throotle variable. Signed-off-by: Juan Quintela --- migration.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/migration.c b/migration.c index 57cb1f8..b8632e5 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; @@ -375,14 +375,12 @@ 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) { memset(current_migration, 0, sizeof(current_migration)); 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) { @@ -408,7 +406,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); @@ -448,9 +446,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; }