{"id":808125,"url":"http://patchwork.ozlabs.org/api/patches/808125/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831082210.8362-5-stefanha@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170831082210.8362-5-stefanha@redhat.com>","list_archive_url":null,"date":"2017-08-31T08:21:59","name":"[PULL,for-2.10,04/15] throttle: Make throttle_is_valid() a bit less verbose","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b6bc90db54f751a748fedec353e48b28a9d7231c","submitter":{"id":17227,"url":"http://patchwork.ozlabs.org/api/people/17227/?format=json","name":"Stefan Hajnoczi","email":"stefanha@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831082210.8362-5-stefanha@redhat.com/mbox/","series":[{"id":766,"url":"http://patchwork.ozlabs.org/api/series/766/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=766","date":"2017-08-31T08:21:55","name":"[PULL,for-2.10,01/15] nvme: Fix get/set number of queues feature, again","version":1,"mbox":"http://patchwork.ozlabs.org/series/766/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808125/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808125/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=stefanha@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjb6p3hwcz9t16\n\tfor ;\n\tThu, 31 Aug 2017 18:25:53 +1000 (AEST)","from localhost ([::1]:54484 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnKnO-0007cr-UZ\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 04:25:50 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42467)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnKkB-0005Ih-Mi\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnKkA-0005rP-PW\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:31 -0400","from mx1.redhat.com ([209.132.183.28]:45330)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnKkA-0005qJ-KV\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:30 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id C68944AE99;\n\tThu, 31 Aug 2017 08:22:29 +0000 (UTC)","from localhost (ovpn-117-89.ams2.redhat.com [10.36.117.89])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id AF37C92D0D;\n\tThu, 31 Aug 2017 08:22:26 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C68944AE99","From":"Stefan Hajnoczi ","To":"","Date":"Thu, 31 Aug 2017 09:21:59 +0100","Message-Id":"<20170831082210.8362-5-stefanha@redhat.com>","In-Reply-To":"<20170831082210.8362-1-stefanha@redhat.com>","References":"<20170831082210.8362-1-stefanha@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tThu, 31 Aug 2017 08:22:29 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL for-2.10 04/15] throttle: Make\n\tthrottle_is_valid() a bit less verbose","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell ,\n\tAlberto Garcia , Stefan Hajnoczi ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Alberto Garcia \n\nUse a pointer to the bucket instead of repeating cfg->buckets[i] all\nthe time. This makes the code more concise and will help us expand the\nchecks later and save a few line breaks.\n\nSigned-off-by: Alberto Garcia \nMessage-id: 763ffc40a26b17d54cf93f5a999e4656049fcf0c.1503580370.git.berto@igalia.com\nSigned-off-by: Stefan Hajnoczi \n---\n util/throttle.c | 15 +++++++--------\n 1 file changed, 7 insertions(+), 8 deletions(-)","diff":"diff --git a/util/throttle.c b/util/throttle.c\nindex 9a6bda813c..bde56fe3de 100644\n--- a/util/throttle.c\n+++ b/util/throttle.c\n@@ -324,32 +324,31 @@ bool throttle_is_valid(ThrottleConfig *cfg, Error **errp)\n }\n \n for (i = 0; i < BUCKETS_COUNT; i++) {\n- if (cfg->buckets[i].avg < 0 ||\n- cfg->buckets[i].max < 0 ||\n- cfg->buckets[i].avg > THROTTLE_VALUE_MAX ||\n- cfg->buckets[i].max > THROTTLE_VALUE_MAX) {\n+ LeakyBucket *bkt = &cfg->buckets[i];\n+ if (bkt->avg < 0 || bkt->max < 0 ||\n+ bkt->avg > THROTTLE_VALUE_MAX || bkt->max > THROTTLE_VALUE_MAX) {\n error_setg(errp, \"bps/iops/max values must be within [0, %lld]\",\n THROTTLE_VALUE_MAX);\n return false;\n }\n \n- if (!cfg->buckets[i].burst_length) {\n+ if (!bkt->burst_length) {\n error_setg(errp, \"the burst length cannot be 0\");\n return false;\n }\n \n- if (cfg->buckets[i].burst_length > 1 && !cfg->buckets[i].max) {\n+ if (bkt->burst_length > 1 && !bkt->max) {\n error_setg(errp, \"burst length set without burst rate\");\n return false;\n }\n \n- if (cfg->buckets[i].max && !cfg->buckets[i].avg) {\n+ if (bkt->max && !bkt->avg) {\n error_setg(errp, \"bps_max/iops_max require corresponding\"\n \" bps/iops values\");\n return false;\n }\n \n- if (cfg->buckets[i].max && cfg->buckets[i].max < cfg->buckets[i].avg) {\n+ if (bkt->max && bkt->max < bkt->avg) {\n error_setg(errp, \"bps_max/iops_max cannot be lower than bps/iops\");\n return false;\n }\n","prefixes":["PULL","for-2.10","04/15"]}