From nobody Sat May 18 15:08:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696840704; cv=none; d=zohomail.com; s=zohoarc; b=F+9BFzcRYJrvBoQnSfvRNu6rf6JUvbtyNJnqfjH3evl80YXCek8uOmXOdIMKd4wisnUMC4PdgjGpgQYPD1c6PQAIoZ8QnGWZ1wPKSb3slCZBbzzCXxLLwJltMlpW058NKNRBQQBZGHI1fWikeONhkGGt4IX4N9ZdPd5wUeVeaLY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696840704; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/lz86oE0J2Pi8F+Oi/gEX4kdk9mCx7n4qEF91OApOLI=; b=fN/vBdsT5qEcWq/2aAjifFb3pdZVHA+IdhjwOZju/M4+Rnnia02cL3vtm3uPHD86R4iNL+yUdDACfgwRCCOFqFlLeIyORvqbE3dGbFB8aXvn0dIauyarRTidJOL35lYpYAr7fDAknFRTxA2AW3sst0gYpepn+KBHE0cIU/IzEfM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696840704718772.8382211560019; Mon, 9 Oct 2023 01:38:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpllo-00072P-Lh; Mon, 09 Oct 2023 04:37:44 -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 1qplln-00071n-6z for qemu-devel@nongnu.org; Mon, 09 Oct 2023 04:37:43 -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 1qplll-0001kW-MM for qemu-devel@nongnu.org; Mon, 09 Oct 2023 04:37:42 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-218-N-PZzRxJOrqxRfVXVXSEvQ-1; Mon, 09 Oct 2023 04:37:28 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 DAF061C0BB42 for ; Mon, 9 Oct 2023 08:37:27 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE7F1C154CF; Mon, 9 Oct 2023 08:37:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696840660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/lz86oE0J2Pi8F+Oi/gEX4kdk9mCx7n4qEF91OApOLI=; b=IgGn4oIlSPdnQOCxhSbBwM5VDsN6so7+OydGVVwbHg0dJQ8VKPd6M1uNU8oBdnyN0Y5UFe 7BGCQejMGFymYbYoVoAUl3fzXOxshkC7PH0TQGtp2ji5Rjv1YBnMJQKsWm6OYpgbCytWVg MXa0DwluFXJtlmBm6SyX0UvE8kCUT38= X-MC-Unique: N-PZzRxJOrqxRfVXVXSEvQ-1 From: Thomas Huth To: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" , qemu-devel@nongnu.org Cc: Gerd Hoffmann , Markus Armbruster Subject: [PATCH v2] contrib/vhost-user-gpu: Fix compiler warning when compiling with -Wshadow Date: Mon, 9 Oct 2023 10:37:25 +0200 Message-ID: <20231009083726.30301-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696840705790100001 Content-Type: text/plain; charset="utf-8" Rename some variables to avoid compiler warnings when compiling with -Wshadow=3Dlocal. Signed-off-by: Thomas Huth --- v2: Renamed the variable to something more unique contrib/vhost-user-gpu/vugpu.h | 8 ++++---- contrib/vhost-user-gpu/vhost-user-gpu.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugpu.h index 509b679f03..654c392fbb 100644 --- a/contrib/vhost-user-gpu/vugpu.h +++ b/contrib/vhost-user-gpu/vugpu.h @@ -164,12 +164,12 @@ struct virtio_gpu_ctrl_command { }; =20 #define VUGPU_FILL_CMD(out) do { \ - size_t s; \ - s =3D iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \ + size_t vugpufillcmd_s_ =3D \ + iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \ &out, sizeof(out)); \ - if (s !=3D sizeof(out)) { \ + if (vugpufillcmd_s_ !=3D sizeof(out)) { \ g_critical("%s: command size incorrect %zu vs %zu", \ - __func__, s, sizeof(out)); \ + __func__, vugpufillcmd_s_, sizeof(out)); \ return; \ } \ } while (0) diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-g= pu/vhost-user-gpu.c index aa304475a0..bb41758e34 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -834,7 +834,7 @@ vg_resource_flush(VuGpu *g, .width =3D width, .height =3D height, }; - pixman_image_t *i =3D + pixman_image_t *img =3D pixman_image_create_bits(pixman_image_get_format(res->imag= e), msg->payload.update.width, msg->payload.update.height, @@ -842,11 +842,11 @@ vg_resource_flush(VuGpu *g, payload.update.data), width * bpp); pixman_image_composite(PIXMAN_OP_SRC, - res->image, NULL, i, + res->image, NULL, img, extents->x1, extents->y1, 0, 0, 0, 0, width, height); - pixman_image_unref(i); + pixman_image_unref(img); vg_send_msg(g, msg, -1); g_free(msg); } --=20 2.41.0