* [PATCH] libvhost-user: Fix compiler warning with -Wshadow=local
@ 2023-10-06 12:11 Thomas Huth
2023-10-08 6:21 ` Michael S. Tsirkin
2023-10-12 6:08 ` Markus Armbruster
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2023-10-06 12:11 UTC (permalink / raw)
To: qemu-devel, Michael S. Tsirkin; +Cc: qemu-trivial, Markus Armbruster
Rename shadowing variables to make this code compilable
with -Wshadow=local.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
subprojects/libvhost-user/libvhost-user.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index 051a611da3..ea2822a44c 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -870,10 +870,10 @@ vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
for (i = 0; i < dev->nregions; i++) {
if (reg_equal(&dev->regions[i], msg_region)) {
VuDevRegion *r = &dev->regions[i];
- void *m = (void *) (uintptr_t) r->mmap_addr;
+ void *ma = (void *) (uintptr_t) r->mmap_addr;
- if (m) {
- munmap(m, r->size + r->mmap_offset);
+ if (ma) {
+ munmap(ma, r->size + r->mmap_offset);
}
/*
@@ -1005,10 +1005,10 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg)
for (i = 0; i < dev->nregions; i++) {
VuDevRegion *r = &dev->regions[i];
- void *m = (void *) (uintptr_t) r->mmap_addr;
+ void *ma = (void *) (uintptr_t) r->mmap_addr;
- if (m) {
- munmap(m, r->size + r->mmap_offset);
+ if (ma) {
+ munmap(ma, r->size + r->mmap_offset);
}
}
dev->nregions = memory->nregions;
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] libvhost-user: Fix compiler warning with -Wshadow=local
2023-10-06 12:11 [PATCH] libvhost-user: Fix compiler warning with -Wshadow=local Thomas Huth
@ 2023-10-08 6:21 ` Michael S. Tsirkin
2023-10-12 6:08 ` Markus Armbruster
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2023-10-08 6:21 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, qemu-trivial, Markus Armbruster
On Fri, Oct 06, 2023 at 02:11:29PM +0200, Thomas Huth wrote:
> Rename shadowing variables to make this code compilable
> with -Wshadow=local.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> subprojects/libvhost-user/libvhost-user.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
> index 051a611da3..ea2822a44c 100644
> --- a/subprojects/libvhost-user/libvhost-user.c
> +++ b/subprojects/libvhost-user/libvhost-user.c
> @@ -870,10 +870,10 @@ vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
> for (i = 0; i < dev->nregions; i++) {
> if (reg_equal(&dev->regions[i], msg_region)) {
> VuDevRegion *r = &dev->regions[i];
> - void *m = (void *) (uintptr_t) r->mmap_addr;
> + void *ma = (void *) (uintptr_t) r->mmap_addr;
>
> - if (m) {
> - munmap(m, r->size + r->mmap_offset);
> + if (ma) {
> + munmap(ma, r->size + r->mmap_offset);
> }
>
> /*
> @@ -1005,10 +1005,10 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg)
>
> for (i = 0; i < dev->nregions; i++) {
> VuDevRegion *r = &dev->regions[i];
> - void *m = (void *) (uintptr_t) r->mmap_addr;
> + void *ma = (void *) (uintptr_t) r->mmap_addr;
>
> - if (m) {
> - munmap(m, r->size + r->mmap_offset);
> + if (ma) {
> + munmap(ma, r->size + r->mmap_offset);
> }
> }
> dev->nregions = memory->nregions;
> --
> 2.41.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] libvhost-user: Fix compiler warning with -Wshadow=local
2023-10-06 12:11 [PATCH] libvhost-user: Fix compiler warning with -Wshadow=local Thomas Huth
2023-10-08 6:21 ` Michael S. Tsirkin
@ 2023-10-12 6:08 ` Markus Armbruster
1 sibling, 0 replies; 3+ messages in thread
From: Markus Armbruster @ 2023-10-12 6:08 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, Michael S. Tsirkin, qemu-trivial
Thomas Huth <thuth@redhat.com> writes:
> Rename shadowing variables to make this code compilable
> with -Wshadow=local.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Queued. Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-12 6:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-06 12:11 [PATCH] libvhost-user: Fix compiler warning with -Wshadow=local Thomas Huth
2023-10-08 6:21 ` Michael S. Tsirkin
2023-10-12 6:08 ` Markus Armbruster
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).