On Fri, Feb 2, 2024 at 4:55 PM David Hildenbrand <da...@redhat.com> wrote:
>
> We never add a memory region if mmap() failed. Therefore, no need to check
> for NULL.
>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
Reviewed-by: Raphael Norwitz <raph...@enfabrica.net>
> ---
> subprojects/libvhost-user/libvhost-user.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/subprojects/libvhost-user/libvhost-user.c
> b/subprojects/libvhost-user/libvhost-user.c
> index a2baefe84b..f99c888b48 100644
> --- a/subprojects/libvhost-user/libvhost-user.c
> +++ b/subprojects/libvhost-user/libvhost-user.c
> @@ -247,11 +247,8 @@ vu_remove_all_mem_regs(VuDev *dev)
>
> for (i = 0; i < dev->nregions; i++) {
> VuDevRegion *r = &dev->regions[i];
> - void *ma = (void *)(uintptr_t)r->mmap_addr;
>
> - if (ma) {
> - munmap(ma, r->size + r->mmap_offset);
> - }
> + munmap((void *)(uintptr_t)r->mmap_addr, r->size + r->mmap_offset);
> }
> dev->nregions = 0;
> }
> @@ -888,11 +885,8 @@ 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 *ma = (void *) (uintptr_t) r->mmap_addr;
>
> - if (ma) {
> - munmap(ma, r->size + r->mmap_offset);
> - }
> + munmap((void *)(uintptr_t)r->mmap_addr, r->size +
> r->mmap_offset);
>
> /*
> * Shift all affected entries by 1 to close the hole at index i
> and
> --
> 2.43.0
>
>
