From patchwork Fri Feb 15 17:47:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 220827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 309F32C0085 for ; Sat, 16 Feb 2013 06:20:56 +1100 (EST) Received: from localhost ([::1]:52996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6Qq6-0007W2-5R for incoming@patchwork.ozlabs.org; Fri, 15 Feb 2013 14:20:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6POq-0007Bf-5S for qemu-devel@nongnu.org; Fri, 15 Feb 2013 12:48:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U6POm-0004T6-AX for qemu-devel@nongnu.org; Fri, 15 Feb 2013 12:48:40 -0500 Received: from mail-vc0-f170.google.com ([209.85.220.170]:54031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6POm-0004Sw-6e for qemu-devel@nongnu.org; Fri, 15 Feb 2013 12:48:36 -0500 Received: by mail-vc0-f170.google.com with SMTP id p16so2325978vcq.1 for ; Fri, 15 Feb 2013 09:48:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=sEc+f6GdAHF18Q91KWsJM+ZMk/hbW5h0PiwB9P9Aw7o=; b=WTLte+ZT9rFk21lws5ixsbr7vAzgRDqREduF4Ur2cp/9UErhW3Fy89PxQ+quv7+0z6 UCVoUp26ni3ExYPL9sOPTURvJr4QLP0VH06xLsWLBKbbqlMp2M/aAlxfv3uqZAPG3NTq a3VDF16qxsnRyo7oeNFgXF8nfzx+J5hpmNFTku3nXXwNysI+Bkt2JGjtmE3Ed576gDr3 5uGsodOkIJvHjHeKASf3I4dnbgAr7d8T7Lh+BuFayzUAdMstn9KG66nq7ouqQ5ZEXcWY /xJrf/HlZHPHFvLqUTQ20jAedcQDvimZz9TMnEwaZgOLdkd3i5YIW1q5BWpqaMEvMz0y cPmg== X-Received: by 10.52.67.105 with SMTP id m9mr3758115vdt.128.1360950505608; Fri, 15 Feb 2013 09:48:25 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id yu12sm65402142vec.6.2013.02.15.09.48.22 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 15 Feb 2013 09:48:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Feb 2013 18:47:00 +0100 Message-Id: <1360950433-17106-29-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360950433-17106-1-git-send-email-pbonzini@redhat.com> References: <1360950433-17106-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.170 Cc: owasserm@redhat.com, chegu_vinod@hp.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 28/41] migration: use qemu_file_rate_limit consistently 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: Paolo Bonzini Reviewed-by: Orit Wasserman Reviewed-by: Juan Quintela --- migration.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/migration.c b/migration.c index 3de7cbf..8d35af5 100644 --- a/migration.c +++ b/migration.c @@ -616,7 +616,7 @@ static void *migration_thread(void *opaque) int64_t current_time = qemu_get_clock_ms(rt_clock); uint64_t pending_size; - if (s->bytes_xfer < s->xfer_limit) { + if (!qemu_file_rate_limit(s->file)) { DPRINTF("iterate\n"); pending_size = qemu_savevm_state_pending(s->file, max_size); DPRINTF("pending size %lu max %lu\n", pending_size, max_size); @@ -655,7 +655,7 @@ static void *migration_thread(void *opaque) s->bytes_xfer = 0; initial_time = current_time; } - if (s->bytes_xfer >= s->xfer_limit) { + if (qemu_file_rate_limit(s->file)) { /* usleep expects microseconds */ g_usleep((initial_time + BUFFER_DELAY - current_time)*1000); }