From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <laurent@vivier.eu>,
Markus Armbruster <armbru@redhat.com>
Subject: [PATCH 2/5] linux-user/mmap.c: clean up local variable shadowing
Date: Mon, 25 Sep 2023 17:10:26 +0200 [thread overview]
Message-ID: <20230925151029.461358-3-laurent@vivier.eu> (raw)
In-Reply-To: <20230925151029.461358-1-laurent@vivier.eu>
Fix following warnings:
.../linux-user/mmap.c: In function 'target_mremap':
.../linux-user/mmap.c:913:13: warning: declaration of 'prot' shadows a previous local [-Wshadow=compatible-local]
913 | int prot = 0;
| ^~~~
../../../Projects/qemu/linux-user/mmap.c:871:9: note: shadowed declaration is here
871 | int prot;
| ^~~~
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/mmap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 8eaf57b208b0..8ccaab78590f 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -910,16 +910,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
}
}
} else {
- int prot = 0;
+ int page_flags = 0;
if (reserved_va && old_size < new_size) {
abi_ulong addr;
for (addr = old_addr + old_size;
addr < old_addr + new_size;
addr++) {
- prot |= page_get_flags(addr);
+ page_flags |= page_get_flags(addr);
}
}
- if (prot == 0) {
+ if (page_flags == 0) {
host_addr = mremap(g2h_untagged(old_addr),
old_size, new_size, flags);
--
2.41.0
next prev parent reply other threads:[~2023-09-25 15:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 15:10 [PATCH 0/5] linux-user: clean up local variable shadowing Laurent Vivier
2023-09-25 15:10 ` [PATCH 1/5] linux-user/flatload: " Laurent Vivier
2023-10-06 9:59 ` Thomas Huth
2023-09-25 15:10 ` Laurent Vivier [this message]
2023-10-06 10:01 ` [PATCH 2/5] linux-user/mmap.c: " Thomas Huth
2023-09-25 15:10 ` [PATCH 3/5] linux-user/syscall.c: clean up local variable shadowing in do_ioctl_dm() Laurent Vivier
2023-10-06 11:05 ` Thomas Huth
2023-09-25 15:10 ` [PATCH 4/5] linux-user/syscall.c: clean up local variable shadowing in TARGET_NR_getcpu Laurent Vivier
2023-10-06 11:07 ` Thomas Huth
2023-09-25 15:10 ` [PATCH 5/5] linux-user/syscall.c: clean up local variable shadowing in xattr syscalls Laurent Vivier
2023-10-06 11:09 ` Thomas Huth
2023-09-29 7:03 ` [PATCH 0/5] linux-user: clean up local variable shadowing Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230925151029.461358-3-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).