Re: [PATCH 01/14] sysbus: Remove sysbus_mmio_unmap

[Cédric Le Goater]

On 6/23/22 11:58, Peter Delevoryas wrote:
> Cedric removed usage of this function in a previous commit.
>
> Fixes: 981b1c6266c6 ("spapr/xive: rework the mapping the KVM memory regions")
> Signed-off-by: Peter Delevoryas <pdel@fb.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.

> ---
>   hw/core/sysbus.c    | 10 ----------
>   include/hw/sysbus.h |  1 -
>   2 files changed, 11 deletions(-)
>
> diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
> index 05c1da3d31..637e18f247 100644
> --- a/hw/core/sysbus.c
> +++ b/hw/core/sysbus.c
> @@ -154,16 +154,6 @@ static void sysbus_mmio_map_common(SysBusDevice *dev, int 
> n, hwaddr addr,
>       }
>   }
>   
> -void sysbus_mmio_unmap(SysBusDevice *dev, int n)
> -{
> -    assert(n >= 0 && n < dev->num_mmio);
> -
> -    if (dev->mmio[n].addr != (hwaddr)-1) {
> -        memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory);
> -        dev->mmio[n].addr = (hwaddr)-1;
> -    }
> -}
> -
>   void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr)
>   {
>       sysbus_mmio_map_common(dev, n, addr, false, 0);
> diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h
> index 3564b7b6a2..153ef20695 100644
> --- a/include/hw/sysbus.h
> +++ b/include/hw/sysbus.h
> @@ -82,7 +82,6 @@ qemu_irq sysbus_get_connected_irq(SysBusDevice *dev, int n);
>   void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr);
>   void sysbus_mmio_map_overlap(SysBusDevice *dev, int n, hwaddr addr,
>                                int priority);
> -void sysbus_mmio_unmap(SysBusDevice *dev, int n);
>   void sysbus_add_io(SysBusDevice *dev, hwaddr addr,
>                      MemoryRegion *mem);
>   MemoryRegion *sysbus_address_space(SysBusDevice *dev);