Re: [PATCH] dump: Silence compiler warning in dump code when compiling with -Wshadow

[Michael Tokarev]

04.10.2023 16:13, Thomas Huth:

Rename a variable to make this code compilable with -Wshadow.

Signed-off-by: Thomas Huth <th...@redhat.com>

Reviewed-By: Michael Tokarev <m...@tls.msk.ru>

  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 
has_format,
      if (vmci) {
          uint64_t addr, note_head_size, name_size, desc_size;
          uint32_t size;
-        uint16_t format;
+        uint16_t guest_format;

note_head_size = dump_is_64bit(s) ?

              sizeof(Elf64_Nhdr) : sizeof(Elf32_Nhdr);

- format = le16_to_cpu(vmci->vmcoreinfo.guest_format);

+        guest_format = le16_to_cpu(vmci->vmcoreinfo.guest_format);
          size = le32_to_cpu(vmci->vmcoreinfo.size);
          addr = 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 != FW_CFG_VMCOREINFO_FORMAT_ELF) {
-            warn_report("guest note format is unsupported: %" PRIu16, format);
+        } else if (guest_format != FW_CFG_VMCOREINFO_FORMAT_ELF) {
+            warn_report("guest note format is unsupported: %" PRIu16, 
guest_format);
          } else {
              s->guest_note = g_malloc(size + 1); /* +1 for adding \0 */
              cpu_physical_memory_read(addr, s->guest_note, size);