From patchwork Fri Oct 6 11:36:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 729992 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp457976wrp; Fri, 6 Oct 2023 04:43:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEEfUw8BNQpt9PFqQaCKBy1mpaWZe5hEzNHmXFf49jIjuR2WltWWTEbf1KbG3VCdX6ZDnDh X-Received: by 2002:a0c:f4cf:0:b0:656:3a3c:8765 with SMTP id o15-20020a0cf4cf000000b006563a3c8765mr8791297qvm.6.1696592592943; Fri, 06 Oct 2023 04:43:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696592592; cv=none; d=google.com; s=arc-20160816; b=yYO+ePFaSeRzbogCdDt6G0mQqy3EAngVrWzL6pTfgDVsw2XJ9yeuqM5nbvK92mdwg7 llrbmxAuOWJ86q9q7XNWQd8TPpwQO3BmCeVbrSfFCzEYnBVH4exSfVAMzxHGzWwYiSBM xvm5Sj5B2dXCPi0ZSiKW5/9/b11/KgzZo+gjQGT09Pl+GV96l1T1pOSdxmW/F6MeGNRO FBNowYZOJqJwHuOXpSKQUsOkb3oUyR6ZeGM5dR1dk5uBfjq30YiSh2NBEmM0Cvh1DilK 3cijNrIGLKUsG8cwzQzi3GKMF/XXFatF/bCYPGHTWwt7MBkypywmVEMYruyUk/c1HsuE egiA== 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=8tO50er00dR7aTTYvXvw7IrMFjKlh8I5Sm2ncEgmemg=; fh=Zaxgg2zL3uPfAXbJA+wClWPCbcGdvuFrt3cxY8aYf0k=; b=zvQOzeo7eg9J0NPT2s+wU3lNUMrk4Lkm0hDI1tlHDlPzeqL0bnf+7n4fbi6pvs/2fe t8F6sXXdgqXg3VO6J9XiNW6LdiQ8It49sshZNABYFarq/2kmvGbUw3PAx+akRq838Fsh WaVpibFCodkUGPu2yHKOxoyhv9vwxoO05upRXZXWwcE5WBn4kdvjaaN3VD1qBVvtwx0X rUscvBqXW6T9zQ6tbf4Rihf/62+MRpNL6aqvM4IffZmMZ2nreg2OTohf8tvHUC8c3GOe q+MUl27AtLS+N6HI6y3dIPgG/H2frhX5w+hzRSWNZrOj5h5mk/kle3zCloGEbCyfFOfU ZpFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EQppMGdu; 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 b10-20020a0cc98a000000b0066407a7a47fsi2194632qvk.608.2023.10.06.04.43.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:43:12 -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=EQppMGdu; 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 1qoj9Q-0005BS-5h; Fri, 06 Oct 2023 07:37:48 -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 1qoj8z-00052u-A8 for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:37:24 -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 1qoj8t-00007l-VA for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:37:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696592224; 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=8tO50er00dR7aTTYvXvw7IrMFjKlh8I5Sm2ncEgmemg=; b=EQppMGdu8wgVMBfaosJE3Ev5zebtaeFIhj3b2vQMHBzWkPivtw0S1DRBauDFy/FSW7Vewb T49MBjNvpeJvVe+P4LutoDYP2io/2WRpKSM4YQv2BjjLLR66yr++VW40omBHQU76Q6/Vuv UW+at3gsVZtusazvXH2W35EzqMmPb/o= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-sfej_yqrOuu63eVMcmUtNw-1; Fri, 06 Oct 2023 07:37:00 -0400 X-MC-Unique: sfej_yqrOuu63eVMcmUtNw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF4E9811E7E; Fri, 6 Oct 2023 11:36:59 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F1451054FC0; Fri, 6 Oct 2023 11:36:59 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 74A2921E6914; Fri, 6 Oct 2023 13:36:57 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , John Snow Subject: [PULL 11/32] hw/ide/ahci: Clean up local variable shadowing Date: Fri, 6 Oct 2023 13:36:36 +0200 Message-ID: <20231006113657.3803180-12-armbru@redhat.com> In-Reply-To: <20231006113657.3803180-1-armbru@redhat.com> References: <20231006113657.3803180-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@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=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é Fix: hw/ide/ahci.c:1577:23: error: declaration shadows a local variable [-Werror,-Wshadow] IDEState *s = &ad->port.ifs[j]; ^ hw/ide/ahci.c:1569:29: note: previous declaration is here void ahci_uninit(AHCIState *s) ^ Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231004120019.93101-3-philmd@linaro.org> Reviewed-by: Richard Henderson Reviewed-by: John Snow Signed-off-by: Markus Armbruster --- hw/ide/ahci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index d0a774bc17..fcc5476e9e 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1622,9 +1622,7 @@ void ahci_uninit(AHCIState *s) AHCIDevice *ad = &s->dev[i]; for (j = 0; j < 2; j++) { - IDEState *s = &ad->port.ifs[j]; - - ide_exit(s); + ide_exit(&ad->port.ifs[j]); } object_unparent(OBJECT(&ad->port)); }