From patchwork Fri Oct 27 09:37:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 738661 Delivered-To: patch@linaro.org Received: by 2002:a5d:5101:0:b0:32d:baff:b0ca with SMTP id s1csp329796wrt; Fri, 27 Oct 2023 02:39:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzh5dv+RDaF8roRSXD3N33O6uU12a1q1d2gfnu+S1iPLYwjrNz4njRuZeXw3XfNA79Vez+ X-Received: by 2002:a05:620a:40c2:b0:775:c5bb:1df9 with SMTP id g2-20020a05620a40c200b00775c5bb1df9mr2421578qko.60.1698399581774; Fri, 27 Oct 2023 02:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698399581; cv=none; d=google.com; s=arc-20160816; b=lXNWx1qazMxyLkS/ba/HiaOezkHI2IluzcnpOfZ8G/bVcyVpxfbPo6djke/N9Xm6kw 85CWDj9Taarfh6WEKYI2HwijMXk3Pz+mr+TyC5xA3W/V5NgZLWFA3ZNOTUNGz7eQsoeo bv0Vk07rGGzHAS/d07efvg9sgJ48JBoYZKDAm5B8ZrjXaRRh2xkgSlczPB3rCum4YMsF 6cquK0q8Goaq7JyyHGhG9EY7zFM/ugEaA/xYcE1xteva9BSGvh1Zetzv6cAZpmGQkJd3 vOs2Ks3Oi2IEKjroHagrsG1vZSNrwvLLDdvLekXa1to+umURmYh0Lmpp/11H/uyumAUg qG5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hEgCgFnTAoeNOn2fWUZ+FE/CsbPbDRXUi3jBdNlv0VA=; fh=rqGQLbSc8GyYHuLYzbGd7cf3pGDU/UNP1g2SZADFNpY=; b=RBBrkygWQKpYYM+bScIjGgktJenpRPLurmGFVD6Q34Pj1opJlg9JMWeyxafdUw+Dxr A1Xz9CKlR9cq4YgCOOzAOdJJa+GdNk6Tqby/hPbqpROA8C+Y/LqMd3W004f6O/fO/JYw uhOs8ky3vhQ8bu1EfCuBE6S92GajFlSWpm9gv1tuK5BdBi5SvG3PEVyD5+TB9j40CZ/z VHB7cqk9ONjerr5RpCa5JYAZreFcQi5WRtsfLBQCPqs+SM7QXyBY5JSToYBpljs9+22a zOm55aTYGuIlHbiYq2F/o2nKp/R+5HpGFVEocm4VjKWF2dkB/ENAqYm1xmNg9nhN7hZS PTgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RIntQAYA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bs33-20020a05620a472100b007680efd52bdsi488314qkb.368.2023.10.27.02.39.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Oct 2023 02:39:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RIntQAYA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwJHQ-0002MP-As; Fri, 27 Oct 2023 05:37:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwJHO-0002Lf-6I for qemu-devel@nongnu.org; Fri, 27 Oct 2023 05:37:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwJHM-0002kB-Q0 for qemu-devel@nongnu.org; Fri, 27 Oct 2023 05:37:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698399439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hEgCgFnTAoeNOn2fWUZ+FE/CsbPbDRXUi3jBdNlv0VA=; b=RIntQAYAV2aAcpJSrIKBkM4zNPqIfTClrxcbDSJ/FCrCM4gUMwYECnPjZe3BA9KXiTwlPw 1ag7VE9DQDSJZHuX2CaLPzSAAuPbsOXgyaN4QjtV/E55pdPDImuA1L/rB0J/aIr6nkUeeW ZFtq5bLvSgHa7ay65xk5zOO+8RcW/zY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-357-8YFFD0jAP_uI2UGIATpykg-1; Fri, 27 Oct 2023 05:37:14 -0400 X-MC-Unique: 8YFFD0jAP_uI2UGIATpykg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9366E88D70C; Fri, 27 Oct 2023 09:37:14 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9081F1121319; Fri, 27 Oct 2023 09:37:13 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Alberto Garcia Subject: [PULL 02/11] tests/throttle: Clean up global variable shadowing Date: Fri, 27 Oct 2023 11:37:01 +0200 Message-ID: <20231027093710.273558-3-thuth@redhat.com> In-Reply-To: <20231027093710.273558-1-thuth@redhat.com> References: <20231027093710.273558-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Follow all other tests pattern from this file, use the global 'cfg' variable to fix: tests/unit/test-throttle.c:621:20: error: declaration shadows a variable in the global scope [-Werror,-Wshadow] ThrottleConfig cfg; ^ tests/unit/test-throttle.c:28:23: note: previous declaration is here static ThrottleConfig cfg; ^ Signed-off-by: Philippe Mathieu-Daudé Acked-by: Alberto Garcia Message-ID: <20231009100251.56019-3-philmd@linaro.org> Signed-off-by: Thomas Huth --- tests/unit/test-throttle.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c index ac35d65d19..2146cfacd3 100644 --- a/tests/unit/test-throttle.c +++ b/tests/unit/test-throttle.c @@ -618,7 +618,6 @@ static bool do_test_accounting(bool is_ops, /* are we testing bps or ops */ { THROTTLE_OPS_TOTAL, THROTTLE_OPS_READ, THROTTLE_OPS_WRITE, } }; - ThrottleConfig cfg; BucketType index; int i;