From patchwork Wed Feb 23 00:44:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 84039 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 4D2B3B7102 for ; Wed, 23 Feb 2011 12:26:16 +1100 (EST) Received: from localhost ([127.0.0.1]:58343 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps33w-00018P-CE for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2011 19:58:40 -0500 Received: from [140.186.70.92] (port=36697 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps2qq-0002zK-5s for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ps2qo-0005Lj-IA for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ps2qo-0005LW-5R for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:06 -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 p1N0j5fw001912 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Feb 2011 19:45:05 -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 p1N0ig39026523; Tue, 22 Feb 2011 19:45:04 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 23 Feb 2011 01:44:31 +0100 Message-Id: <578a95f5c8b416fcf30f3bba728069ba73afba9e.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 17/22] migration: use global variable 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 We are setting a pointer to a local variable in the previous line, just use the global variable directly. We remove the ->file test because it is already done inside qemu_file_set_rate_limit() function. Signed-off-by: Juan Quintela --- migration.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/migration.c b/migration.c index d7dfe1e..accc6e4 100644 --- a/migration.c +++ b/migration.c @@ -451,7 +451,6 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) { int64_t d; - MigrationState *s; d = qdict_get_int(qdict, "value"); if (d < 0) { @@ -459,9 +458,8 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) } max_throttle = d; - s = current_migration; - if (s && s->file) { - qemu_file_set_rate_limit(s->file, max_throttle); + if (current_migration) { + qemu_file_set_rate_limit(current_migration->file, max_throttle); } return 0;