From patchwork Fri Feb 5 10:59:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 8233591 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 8F0F2BEEE5 for ; Fri, 5 Feb 2016 11:06:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E17AB20390 for ; Fri, 5 Feb 2016 11:06:18 +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 2863F202C8 for ; Fri, 5 Feb 2016 11:06:18 +0000 (UTC) Received: from localhost ([::1]:47534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aReDR-0001Mm-GV for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Feb 2016 06:06:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRe9P-00028s-5g for qemu-devel@nongnu.org; Fri, 05 Feb 2016 06:02:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRe9L-0003xm-0v for qemu-devel@nongnu.org; Fri, 05 Feb 2016 06:02:07 -0500 Received: from smtp3.mundo-r.com ([212.51.32.191]:14685 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRe9K-0003fw-Pq; Fri, 05 Feb 2016 06:02:02 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2D9BAAzgLRW/5tjdVteGQEBAQEPAQEBAY0ksRqBZoYNAoE4ORMBAQEBAQEBgQqEQgEFeRA/EjwbGYgfAcAHiAeLLgWWc41QjnNEGI1jIQFAg2aKZAEBAQ X-IPAS-Result: A2D9BAAzgLRW/5tjdVteGQEBAQEPAQEBAY0ksRqBZoYNAoE4ORMBAQEBAQEBgQqEQgEFeRA/EjwbGYgfAcAHiAeLLgWWc41QjnNEGI1jIQFAg2aKZAEBAQ X-IronPort-AV: E=Sophos;i="5.22,399,1449529200"; d="scan'208";a="81163406" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 05 Feb 2016 11:59:48 +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 1aRe78-0007eI-HL; Fri, 05 Feb 2016 11:59:46 +0100 Received: from berto by perseus.local with local (Exim 4.86) (envelope-from ) id 1aRe6v-0007d8-68; Fri, 05 Feb 2016 12:59:33 +0200 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 5 Feb 2016 12:59:13 +0200 Message-Id: <16138e6a87874b0626fd25e0669fe549b308c502.1454669823.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 03/13] throttle: Make throttle_max_is_missing_limit() set errp 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 The caller does not need to set it, and this will allow us to refactor this function later. Signed-off-by: Alberto Garcia --- blockdev.c | 4 +--- include/qemu/throttle.h | 2 +- tests/test-throttle.c | 6 +++--- util/throttle.c | 5 ++++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index d8e5b57..5472147 100644 --- a/blockdev.c +++ b/blockdev.c @@ -355,9 +355,7 @@ static bool check_throttle_config(ThrottleConfig *cfg, Error **errp) return false; } - if (throttle_max_is_missing_limit(cfg)) { - error_setg(errp, "bps_max/iops_max require corresponding" - " bps/iops values"); + if (throttle_max_is_missing_limit(cfg, errp)) { return false; } diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h index 69cf171..03bdec0 100644 --- a/include/qemu/throttle.h +++ b/include/qemu/throttle.h @@ -110,7 +110,7 @@ bool throttle_conflicting(ThrottleConfig *cfg, Error **errp); bool throttle_is_valid(ThrottleConfig *cfg); -bool throttle_max_is_missing_limit(ThrottleConfig *cfg); +bool throttle_max_is_missing_limit(ThrottleConfig *cfg, Error **errp); void throttle_config(ThrottleState *ts, ThrottleTimers *tt, diff --git a/tests/test-throttle.c b/tests/test-throttle.c index 769865d..9cbca4b 100644 --- a/tests/test-throttle.c +++ b/tests/test-throttle.c @@ -337,15 +337,15 @@ static void test_max_is_missing_limit(void) memset(&cfg, 0, sizeof(cfg)); cfg.buckets[i].max = 100; cfg.buckets[i].avg = 0; - g_assert(throttle_max_is_missing_limit(&cfg)); + g_assert(throttle_max_is_missing_limit(&cfg, NULL)); cfg.buckets[i].max = 0; cfg.buckets[i].avg = 0; - g_assert(!throttle_max_is_missing_limit(&cfg)); + g_assert(!throttle_max_is_missing_limit(&cfg, NULL)); cfg.buckets[i].max = 0; cfg.buckets[i].avg = 100; - g_assert(!throttle_max_is_missing_limit(&cfg)); + g_assert(!throttle_max_is_missing_limit(&cfg, NULL)); } } diff --git a/util/throttle.c b/util/throttle.c index 564e132..77010b4 100644 --- a/util/throttle.c +++ b/util/throttle.c @@ -306,13 +306,16 @@ bool throttle_is_valid(ThrottleConfig *cfg) /* check if bps_max/iops_max is used without bps/iops * @cfg: the throttling configuration to inspect + * @errp: error object */ -bool throttle_max_is_missing_limit(ThrottleConfig *cfg) +bool throttle_max_is_missing_limit(ThrottleConfig *cfg, Error **errp) { int i; for (i = 0; i < BUCKETS_COUNT; i++) { if (cfg->buckets[i].max && !cfg->buckets[i].avg) { + error_setg(errp, "bps_max/iops_max require corresponding" + " bps/iops values"); return true; } }