From patchwork Fri Oct 27 09:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 738654 Delivered-To: patch@linaro.org Received: by 2002:a5d:5101:0:b0:32d:baff:b0ca with SMTP id s1csp329113wrt; Fri, 27 Oct 2023 02:37:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEG039AfrHYgbjZ2SXv41+rJEcA3eWGTx9WDLCioAdua70un+bofdYNKZuWUY39Iis2iAIP X-Received: by 2002:a05:622a:1309:b0:40b:9015:7eee with SMTP id v9-20020a05622a130900b0040b90157eeemr2216269qtk.8.1698399463309; Fri, 27 Oct 2023 02:37:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698399463; cv=none; d=google.com; s=arc-20160816; b=bTDLSTF54tBKk96eO24pfk93DG1CYIshDGJISAOatMdnfv++1NvUkxQT5TdfPADeSg 6KZNjDleT905yFZcDRDHnabbbWprLqV17uOthYsU/oLaPoSLzJC+AOUz3WA6g5jZrFTv ox0SJAErEoCX0GFZCZ6CTXHoolXsYnYAsgXFAqSOE/ZmUBeZkgECtZsbVREW3h7qmIJY w2M09nyEWZUnaCxVR1bShW8VfEphRNNFT9yBOdWn/GXegde4tiM8DyopbaB76478WNPw QarvJP3GDgLP6+2yV6Q3S7cFDWknVfHmgwmFN94icMMR5sRzhrTAue80o5rw7DXxlvTE 0fQQ== 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=ejfR3tG+ALRFLzO/F9Cf1UhOQnGFzqz7rSC5v/ESiyo=; fh=v4Od8AV8CasN/MSPHyLLRlMoMNLi4w2e4OnGqcWrA1Y=; b=0dO8S9F1Np58KAjKfreqGV6JHoEaxstK6WjJgVPrsETWrgZl63Nj94NjSqGawIcZZU Q1l2WHCqlHwhraskUX03Wb39wR2efcVsyaKDB0D7ZgpaaqEZYMWP1EZeHRKl4txmPAH1 1bkj7Aq/cvUYaIHPPwDfkzWveRi0zCa8Ccj4ps7bajYC+4Uq2JOwjmYRJZXHxg4uTbL/ SQBUh9S6YtLY9VNDRoNxWp33ym+sWd/wrbExFDafgVCPE32xKBIYVseBlBgTCtQIjGwI 1Lvj/kievQb/EzXy2ImuQM3bTDRL24cT37aeqFvzvXYbeEqB4hmRf/shZw9jYP8I1+RR 4IbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Usl+cGj5; 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 w20-20020a05622a191400b0041cb481b946si553229qtc.389.2023.10.27.02.37.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Oct 2023 02:37:43 -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=Usl+cGj5; 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 1qwJHP-0002MF-Kt; Fri, 27 Oct 2023 05:37:23 -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 1qwJHN-0002LX-TG for qemu-devel@nongnu.org; Fri, 27 Oct 2023 05:37:21 -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-0002kE-Ei 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=ejfR3tG+ALRFLzO/F9Cf1UhOQnGFzqz7rSC5v/ESiyo=; b=Usl+cGj5D0uUKWh8j6fpkAWSwd8pJ1usxI8ckl67Xo5/MIsGJKGjR3tjSbQSo1pL7GmorE 8qwpHd0gefLJQh6ZOSS7hj6vGxvC9x96MeJ7pI0rDCufSDwxMM0CCNT5+RcUQNEVvFVkKm PuLKoI6z9pRORY+jFHFVXYM4QZ81lQM= 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-533-wFrkwvDDPwm8agaNAcoXQA-1; Fri, 27 Oct 2023 05:37:16 -0400 X-MC-Unique: wFrkwvDDPwm8agaNAcoXQA-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 06AF084B105; Fri, 27 Oct 2023 09:37:16 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id E72A11121319; Fri, 27 Oct 2023 09:37:14 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Emmanouil Pitsidianakis Subject: [PULL 03/11] tests/virtio-scsi: Clean up global variable shadowing Date: Fri, 27 Oct 2023 11:37:02 +0200 Message-ID: <20231027093710.273558-4-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é Rename the (unused) 'allow' argument, following the pattern used by the other tests in this file. This fixes: tests/qtest/virtio-scsi-test.c:159:61: error: declaration shadows a variable in the global scope [-Werror,-Wshadow] static void hotplug(void *obj, void *data, QGuestAllocator *alloc) ^ tests/qtest/virtio-scsi-test.c:37:25: note: previous declaration is here static QGuestAllocator *alloc; ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-By: Emmanouil Pitsidianakis Reviewed-by: Thomas Huth Message-ID: <20231009100251.56019-4-philmd@linaro.org> Signed-off-by: Thomas Huth --- tests/qtest/virtio-scsi-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/virtio-scsi-test.c b/tests/qtest/virtio-scsi-test.c index ceaa7f2415..db10d572d0 100644 --- a/tests/qtest/virtio-scsi-test.c +++ b/tests/qtest/virtio-scsi-test.c @@ -156,7 +156,7 @@ static QVirtioSCSIQueues *qvirtio_scsi_init(QVirtioDevice *dev) return vs; } -static void hotplug(void *obj, void *data, QGuestAllocator *alloc) +static void hotplug(void *obj, void *data, QGuestAllocator *t_alloc) { QTestState *qts = global_qtest;