From nobody Sun May 19 20:12:56 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=1696425303; cv=none; d=zohomail.com; s=zohoarc; b=YNtskoVjRIIu0mfZ07yLWSmy+C/OSR5TEOhudaxNPBiJhyvGMvAJazfWml1solrVeMuHkuv7MZsKmHDcCNrbg8zjUQGFMO0Lg+t6/eqwTMHT9TL54e60yC79W3hiQw9GSpG7EQjuDpPW8g01+oRZRyaUQhZMPx70qjr1Oc/crVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696425303; 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=+E8fYpbb8ncGc3U9mYCKCyFZn4aX85S9z4TeFI0ash8=; b=EWKR2UPOGh5eRD+0x7eyT0hN7oTqWjXS97/IE2isXX2qmkYQRI6I9XQZRc0ymQo5zAimVs8zB7scwYhg1vYRJ4TDpnP7jhfuRUGmKUvJyKWnddtBPDV4r5f1sMYC5iHjtOSfzgmOy4sM8JqZGS5sNyNrcWPH0CzK9zs1kbhpM3M= 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 1696425303703404.78729373396936; Wed, 4 Oct 2023 06:15:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qo1hZ-0006hV-V2; Wed, 04 Oct 2023 09:14:11 -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 1qo1hI-0006dR-Ek for qemu-devel@nongnu.org; Wed, 04 Oct 2023 09:13:54 -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 1qo1hG-0001c3-C8 for qemu-devel@nongnu.org; Wed, 04 Oct 2023 09:13:51 -0400 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-362-8SJuIeA_PSmshVCFfuYpuw-1; Wed, 04 Oct 2023 09:13:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 E9461811E86; Wed, 4 Oct 2023 13:13:40 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2E0B40C2015; Wed, 4 Oct 2023 13:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696425229; 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=+E8fYpbb8ncGc3U9mYCKCyFZn4aX85S9z4TeFI0ash8=; b=H/oOwzKJyUypEBdgbkIbeU7RQ9Cu7tQkPMzBqPeIka3A5IR+8VuHbAkkW7DkKQaU2KMop2 +NQpjtYr+zDY6CFYKbQjFd1B+lMN8QlATbspdYNsIVt+R9zq08UMHyfCQnR49NTMELRc2R bez7ilm7RvO1cw4VEwxCYvZfdqWMtu8= X-MC-Unique: 8SJuIeA_PSmshVCFfuYpuw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Cc: Markus Armbruster , qemu-trivial@nongnu.org Subject: [PATCH] dump: Silence compiler warning in dump code when compiling with -Wshadow Date: Wed, 4 Oct 2023 15:13:38 +0200 Message-ID: <20231004131338.215081-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696425304874100003 Content-Type: text/plain; charset="utf-8" Rename a variable to make this code compilable with -Wshadow. Signed-off-by: Thomas Huth Reviewed-By: Michael Tokarev Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- dump/dump.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index d4ef713cd0..d3578ddc62 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -1872,20 +1872,20 @@ static void dump_init(DumpState *s, int fd, bool ha= s_format, if (vmci) { uint64_t addr, note_head_size, name_size, desc_size; uint32_t size; - uint16_t format; + uint16_t guest_format; =20 note_head_size =3D dump_is_64bit(s) ? sizeof(Elf64_Nhdr) : sizeof(Elf32_Nhdr); =20 - format =3D le16_to_cpu(vmci->vmcoreinfo.guest_format); + guest_format =3D le16_to_cpu(vmci->vmcoreinfo.guest_format); size =3D le32_to_cpu(vmci->vmcoreinfo.size); addr =3D le64_to_cpu(vmci->vmcoreinfo.paddr); if (!vmci->has_vmcoreinfo) { warn_report("guest note is not present"); } else if (size < note_head_size || size > MAX_GUEST_NOTE_SIZE) { warn_report("guest note size is invalid: %" PRIu32, size); - } else if (format !=3D FW_CFG_VMCOREINFO_FORMAT_ELF) { - warn_report("guest note format is unsupported: %" PRIu16, form= at); + } else if (guest_format !=3D FW_CFG_VMCOREINFO_FORMAT_ELF) { + warn_report("guest note format is unsupported: %" PRIu16, gues= t_format); } else { s->guest_note =3D g_malloc(size + 1); /* +1 for adding \0 */ cpu_physical_memory_read(addr, s->guest_note, size); --=20 2.41.0