From patchwork Thu Feb 18 10:26:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 8348471 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2787FC0553 for ; Thu, 18 Feb 2016 10:30:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8EF6D20376 for ; Thu, 18 Feb 2016 10:30:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD44720375 for ; Thu, 18 Feb 2016 10:30:48 +0000 (UTC) Received: from localhost ([::1]:39655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWLrE-0006Q5-6g for patchwork-qemu-devel@patchwork.kernel.org; Thu, 18 Feb 2016 05:30:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWLoo-0002Wf-3j for qemu-devel@nongnu.org; Thu, 18 Feb 2016 05:28:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWLok-0006sC-Sf for qemu-devel@nongnu.org; Thu, 18 Feb 2016 05:28:18 -0500 Received: from smtp3.mundo-r.com ([212.51.32.191]:35626 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWLok-0006lu-Mn; Thu, 18 Feb 2016 05:28:14 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CaAwCPm8VW/5tjdVteGQEBAg8BAQEBgwqBP6ZGAQEEBQGBD5AqghMBDYFnhg0CgWA4FAEBAQEBAQFkJ4RCAQEEeRA/EjwbGYgeAbtTAQEBByCFSoI9h0eDbgWXBY1ajnNEGI1rHgEBQoICGYFKaIkfAQEB X-IPAS-Result: A2CaAwCPm8VW/5tjdVteGQEBAg8BAQEBgwqBP6ZGAQEEBQGBD5AqghMBDYFnhg0CgWA4FAEBAQEBAQFkJ4RCAQEEeRA/EjwbGYgeAbtTAQEBByCFSoI9h0eDbgWXBY1ajnNEGI1rHgEBQoICGYFKaIkfAQEB X-IronPort-AV: E=Sophos;i="5.22,464,1449529200"; d="scan'208";a="86269616" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 18 Feb 2016 11:27:36 +0100 Received: from dsl-hkibrasgw4-50df50-201.dhcp.inet.fi ([80.223.80.201] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim) id 1aWLo8-0000iU-CM; Thu, 18 Feb 2016 11:27:36 +0100 Received: from berto by perseus.local with local (Exim 4.86) (envelope-from ) id 1aWLnu-0001eN-T9; Thu, 18 Feb 2016 12:27:22 +0200 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 18 Feb 2016 12:26:54 +0200 Message-Id: <849efcea08515f8221175264ff28ec9202eeb009.1455788710.git.berto@igalia.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v2 01/17] throttle: Make throttle_compute_timer() static 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This function is only used internally in throttle.c Signed-off-by: Alberto Garcia Reviewed-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- include/qemu/throttle.h | 6 ------ util/throttle.c | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h index d0c98ed..52c98d9 100644 --- a/include/qemu/throttle.h +++ b/include/qemu/throttle.h @@ -84,12 +84,6 @@ void throttle_leak_bucket(LeakyBucket *bkt, int64_t delta); int64_t throttle_compute_wait(LeakyBucket *bkt); -/* expose timer computation function for unit tests */ -bool throttle_compute_timer(ThrottleState *ts, - bool is_write, - int64_t now, - int64_t *next_timestamp); - /* init/destroy cycle */ void throttle_init(ThrottleState *ts); diff --git a/util/throttle.c b/util/throttle.c index 2f9b23d..c21043a 100644 --- a/util/throttle.c +++ b/util/throttle.c @@ -137,10 +137,10 @@ static int64_t throttle_compute_wait_for(ThrottleState *ts, * @next_timestamp: the resulting timer * @ret: true if a timer must be set */ -bool throttle_compute_timer(ThrottleState *ts, - bool is_write, - int64_t now, - int64_t *next_timestamp) +static bool throttle_compute_timer(ThrottleState *ts, + bool is_write, + int64_t now, + int64_t *next_timestamp) { int64_t wait;