From patchwork Fri Sep 29 08:50:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727613 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp332959wrt; Fri, 29 Sep 2023 01:55:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5JxYCX6r3hQ9nL182VlUatvctqhu6vA5vJSTMoSa+SK3VZRdyLpke6ehNPoZ9EzCfcElv X-Received: by 2002:a05:620a:3913:b0:774:179d:659a with SMTP id qr19-20020a05620a391300b00774179d659amr3701502qkn.34.1695977751346; Fri, 29 Sep 2023 01:55:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977751; cv=none; d=google.com; s=arc-20160816; b=lNMgl/q4vgX/0D37H5xUdWUinjZI8xkg4YqVr7CaYmfZykcUV4vHguYUnrPfB4/jBW GXLb28wlsqaU1puMfTw+Vap7d/HhBnznprH5i6rc4dC96rr/BKKVtepfSqnXD66pF2pB UqKTrYhTh4zPmWoh3ReMRKirJ4Mh6Cg4kTi5vDnvv5UQIK9WLFesJ4Kf3R9dbJG+4ScM mKsDXau7dZU6sq1asli6QOSfjg5LGeHpjrThjHV6Za43HXBFhYstOICTHFE708NA72ms A95mpgYgUS4Y3EPwLQrWVWrBk/5AvYAwYiqUBaQFSeK35cxQ/BuAXOe+gLg4FV5v8zAe y1XA== 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=5xtaxu9vx6HTcALqnXkzmf305ZuqxOnzTYiMi68kHS8=; fh=nERd176022K4vpnJvTmk0fDn57Eykgdsza7ZL0rhDn4=; b=gC6eIKVv2g8Aq2wRr14Q/4MenVDRjENCkJ2KBVQuS7DrtE4UWx96bRe8fCdJWur2Gv Jh4V4KAlvuF5PlY/qPB13IzrPr06V72I7NEJpa5DmNFWoRIhvQ8L/Tt8NAjhaml4qq9r 68E47x2zPS1fC6Vptym/kpK5V5+btVKyxxgU+jR6ULketNL2QKJ4WtgEcs0wc1+xySTB +9fxy5wZZap0+gbNw1wRF0CqfthBsO+G9s3zHw8zOnK2xp1kMKj6uIEzBkSWnrfQ94HL G/m1SKRTduEgBrnxjvKCNup2qUZc38YFRl4bumTlx/VQpZ/Jgu+GdOcS0pfnncgFdHH5 NT9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Fpd9ez7X; 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 w10-20020a0cb54a000000b0065b174c561fsi4342058qvd.112.2023.09.29.01.55.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:55:51 -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=Fpd9ez7X; 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 1qm9DZ-000589-2o; Fri, 29 Sep 2023 04:51:25 -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 1qm9DS-00050W-8m for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:19 -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 1qm9DB-0005ck-RV for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977461; 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=5xtaxu9vx6HTcALqnXkzmf305ZuqxOnzTYiMi68kHS8=; b=Fpd9ez7XFZF7MI+fgx7PGyYYwpGJVfel0jF52W51rEqb2eeL57iYxfKoptDEHVobe4ITXl 28PBRx1fHN1QFhb2ECmux+AHpvfhw38nQCOLxD5gbFpbA9K2C/tKMus5RfWag3a2d3KM1J Jsfaj8ZXcDC1tL+K3uiSJ480I3jiDDk= 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-472-jZoZGFg6M7-2PSuUR5K9-Q-1; Fri, 29 Sep 2023 04:50:56 -0400 X-MC-Unique: jZoZGFg6M7-2PSuUR5K9-Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 A4DB885A5BE; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 827E340C6EC1; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8F02021E6886; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Michael S . Tsirkin" Subject: [PULL 22/56] util/vhost-user-server: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:19 +0200 Message-ID: <20230929085053.2789105-23-armbru@redhat.com> In-Reply-To: <20230929085053.2789105-1-armbru@redhat.com> References: <20230929085053.2789105-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: util/vhost-user-server.c: In function ‘set_watch’: util/vhost-user-server.c:274:20: warning: declaration of ‘vu_fd_watch’ shadows a previous local [-Wshadow=compatible-local] 274 | VuFdWatch *vu_fd_watch = g_new0(VuFdWatch, 1); | ^~~~~~~~~~~ util/vhost-user-server.c:271:16: note: shadowed declaration is here 271 | VuFdWatch *vu_fd_watch = find_vu_fd_watch(server, fd); | ^~~~~~~~~~~ Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230904161235.84651-18-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Markus Armbruster --- util/vhost-user-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c index b4b6bf30a2..5ccc6d24a0 100644 --- a/util/vhost-user-server.c +++ b/util/vhost-user-server.c @@ -278,7 +278,7 @@ set_watch(VuDev *vu_dev, int fd, int vu_evt, VuFdWatch *vu_fd_watch = find_vu_fd_watch(server, fd); if (!vu_fd_watch) { - VuFdWatch *vu_fd_watch = g_new0(VuFdWatch, 1); + vu_fd_watch = g_new0(VuFdWatch, 1); QTAILQ_INSERT_TAIL(&server->vu_fd_watches, vu_fd_watch, next);