Browse Source

libvhost-user: Fix compiler warning with -Wshadow=local

Rename shadowing variables to make this code compilable
with -Wshadow=local.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231006121129.487251-1-thuth@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
pull/254/head
Thomas Huth 3 years ago
committed by Markus Armbruster
parent
commit
61499d87f4
  1. 12
      subprojects/libvhost-user/libvhost-user.c

12
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;

Loading…
Cancel
Save