From patchwork Wed Feb 23 00:44:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 84030 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 43052B710F for ; Wed, 23 Feb 2011 12:07:27 +1100 (EST) Received: from localhost ([127.0.0.1]:47779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps3CO-0004VZ-Cy for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2011 20:07:24 -0500 Received: from [140.186.70.92] (port=36735 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps2qt-000321-Kk for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ps2qs-0005MV-A8 for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ps2qr-0005MI-WD for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:10 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1N0j99D018772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Feb 2011 19:45:09 -0500 Received: from trasno.mitica (ovpn-113-108.phx2.redhat.com [10.3.113.108]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1N0ig3C026523; Tue, 22 Feb 2011 19:45:08 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 23 Feb 2011 01:44:34 +0100 Message-Id: <2e456a493059e712a64305f9b79bdf6100a55c34.1298421307.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 20/22] migration: Use bandwidth_limit directly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: 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 | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/migration.c b/migration.c index 7b1e679..312a029 100644 --- a/migration.c +++ b/migration.c @@ -31,11 +31,10 @@ do { } while (0) #endif -/* Migration speed throttling */ -static int64_t max_throttle = (32 << 20); - static MigrationState current_migration = { .state = MIG_STATE_NONE, + /* Migration speed throttling */ + .bandwidth_limit = (32 << 20), }; static NotifierList migration_state_notifiers = @@ -364,13 +363,11 @@ 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) { 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) { @@ -396,7 +393,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(¤t_migration, p); @@ -437,9 +434,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; }