From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF1DCCDB47E for ; Fri, 13 Oct 2023 06:27:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrBdY-0007bA-7H; Fri, 13 Oct 2023 02:27:04 -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 1qrBdX-0007aL-BA for qemu-devel@nongnu.org; Fri, 13 Oct 2023 02:27:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrBdQ-0005Nd-CE for qemu-devel@nongnu.org; Fri, 13 Oct 2023 02:27:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697178415; 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:autocrypt:autocrypt; bh=f7HEKLNq8M2lvJCHLYhDjbmjEdtYnnAPMI10vX2ZiXo=; b=AG3yl3A9tIyNr/KabOEAnhv3EyBg8EAgkNQaGAhsgOjq08dyMhQmLso/tMooOyFnoM9hW+ 03PrPDplNvefBsX7VzxLC+N9kWIx2grYoGeSNyTnNbb3ozKQe54lukdxStGD0ynxpYa5mu IH5CveunNdLG6Oa4o2zSGsmfrDxJaQQ= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-290-VoWgCvN6MRCEjoKfSVRvHw-1; Fri, 13 Oct 2023 02:26:52 -0400 X-MC-Unique: VoWgCvN6MRCEjoKfSVRvHw-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-533d8a785a5so1447143a12.3 for ; Thu, 12 Oct 2023 23:26:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697178411; x=1697783211; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f7HEKLNq8M2lvJCHLYhDjbmjEdtYnnAPMI10vX2ZiXo=; b=nz/CUKOlI5L7EoICYvcJqnAnr8RVQB92VeRFCk5/Qsr20wLpKAQ4U3So1nGm+xsXnk ICd9P9o/QJANhEseHO7CuD5sOWLHsN1pDri3G0PjIcNFWFluQzGqyP53Rcr7ITGBDbja 4xgtc7Ok/6b23L45SBFSPO9ht5NbkWk66GnJ84XbhHH5HkWPg4Nz8eAy5ho0FLJkxqh6 pwrJgQ91x1J2XYAZynVB0bdjYMTQcNlWZ1zIg7IFzSm6rB1AfDs7h7EG06CUOuH+Cw5g UcQy/X6fXKJXMzHHp0uGH8GzaiGK/EQmC/B5OZYYwPsVP2K7R1MHQRHanSieLV0ErVbs 5lVA== X-Gm-Message-State: AOJu0YycarX6dAPSjEusyQOIWhaSJjTjPmPf5TGSaPhoB2Yw+9VBjLds fDmAHGsWSu8MWJzQBce2FRoNH377XLKk78owIkaoCTDNDydEUfd2w3IgGCAWfFzmXZH3pglbKIE PVbfFLsAUnAYNTco= X-Received: by 2002:a50:c302:0:b0:53d:e139:64a5 with SMTP id a2-20020a50c302000000b0053de13964a5mr6447300edb.27.1697178411648; Thu, 12 Oct 2023 23:26:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGzKVouHAWO9cP+E7v0Q9+JlUrzMN+RANjZg3UWX+iJGGLkv4f6+LrqTD9Rd290QyQoJlXMtA== X-Received: by 2002:a50:c302:0:b0:53d:e139:64a5 with SMTP id a2-20020a50c302000000b0053de13964a5mr6447281edb.27.1697178411381; Thu, 12 Oct 2023 23:26:51 -0700 (PDT) Received: from [192.168.0.5] (ip-109-43-176-176.web.vodafone.de. [109.43.176.176]) by smtp.gmail.com with ESMTPSA id i22-20020a50d756000000b0053dda7926fcsm2953926edj.60.2023.10.12.23.26.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Oct 2023 23:26:51 -0700 (PDT) Message-ID: <51c9380c-e1aa-46e9-8d53-c88672edd270@redhat.com> Date: Fri, 13 Oct 2023 08:26:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 09/10] tests/aio-multithread: Clean up global variable shadowing Content-Language: en-US To: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Alberto Garcia , Hao Wu , Kevin Wolf , Laurent Vivier , Paolo Bonzini , qemu-block@nongnu.org, John Snow , Stefan Hajnoczi , Fam Zheng , Tyrone Ting , Markus Armbruster References: <20231009100251.56019-1-philmd@linaro.org> <20231009100251.56019-10-philmd@linaro.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20231009100251.56019-10-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 09/10/2023 12.02, Philippe Mathieu-Daudé wrote: > Rename the argument to avoid: > > tests/unit/test-aio-multithread.c:226:37: error: declaration shadows a variable in the global scope [-Werror,-Wshadow] > static void test_multi_co_mutex(int threads, int seconds) > ^ > tests/unit/test-aio-multithread.c:401:34: error: declaration shadows a variable in the global scope [-Werror,-Wshadow] > static void test_multi_mutex(int threads, int seconds) > ^ > tests/unit/test-aio-multithread.c:24:18: note: previous declaration is here > static IOThread *threads[NUM_CONTEXTS]; > ^ > > Signed-off-by: Philippe Mathieu-Daudé > --- > tests/unit/test-aio-multithread.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/tests/unit/test-aio-multithread.c b/tests/unit/test-aio-multithread.c > index 08d4570ccb..d587f20667 100644 > --- a/tests/unit/test-aio-multithread.c > +++ b/tests/unit/test-aio-multithread.c > @@ -223,7 +223,7 @@ static void coroutine_fn test_multi_co_mutex_entry(void *opaque) > qatomic_dec(&running); > } > > -static void test_multi_co_mutex(int threads, int seconds) > +static void test_multi_co_mutex(unsigned ctx_num, int seconds) Why did you change the type of the variable? ... you should at least mention this in the commit description. > { > int i; > > @@ -233,9 +233,9 @@ static void test_multi_co_mutex(int threads, int seconds) > now_stopping = false; > > create_aio_contexts(); > - assert(threads <= NUM_CONTEXTS); > - running = threads; > - for (i = 0; i < threads; i++) { > + assert(ctx_num <= NUM_CONTEXTS); > + running = ctx_num; > + for (i = 0; i < ctx_num; i++) { > Coroutine *co1 = qemu_coroutine_create(test_multi_co_mutex_entry, NULL); > aio_co_schedule(ctx[i], co1); > } > @@ -398,7 +398,7 @@ static void test_multi_mutex_entry(void *opaque) > qatomic_dec(&running); > } > > -static void test_multi_mutex(int threads, int seconds) > +static void test_multi_mutex(unsigned ctx_num, int seconds) dito. Thomas > { > int i; > > @@ -408,9 +408,9 @@ static void test_multi_mutex(int threads, int seconds) > now_stopping = false; > > create_aio_contexts(); > - assert(threads <= NUM_CONTEXTS); > - running = threads; > - for (i = 0; i < threads; i++) { > + assert(ctx_num <= NUM_CONTEXTS); > + running = ctx_num; > + for (i = 0; i < ctx_num; i++) { > Coroutine *co1 = qemu_coroutine_create(test_multi_mutex_entry, NULL); > aio_co_schedule(ctx[i], co1); > }