Re: [Qemu-devel] [PATCH 3/6] hw/block/pflash_cfi02: Convert away from old_mmio

[Philippe Mathieu-Daudé]

On 06/01/2018 11:12 AM, Peter Maydell wrote:
> Convert the pflash_cfi02 device away from using the old_mmio field
> of MemoryRegionOps.
> 
> Signed-off-by: Peter Maydell <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  hw/block/pflash_cfi02.c | 97 ++++++++---------------------------------
>  1 file changed, 18 insertions(+), 79 deletions(-)
> 
> diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
> index 75d1ae1026..84d4584100 100644
> --- a/hw/block/pflash_cfi02.c
> +++ b/hw/block/pflash_cfi02.c
> @@ -494,102 +494,41 @@ static void pflash_write (pflash_t *pfl, hwaddr offset,
>      pfl->cmd = 0;
>  }
>  
> -
> -static uint32_t pflash_readb_be(void *opaque, hwaddr addr)
> +static uint64_t pflash_be_readfn(void *opaque, hwaddr addr, unsigned size)
>  {
> -    return pflash_read(opaque, addr, 1, 1);
> +    return pflash_read(opaque, addr, size, 1);
>  }
>  
> -static uint32_t pflash_readb_le(void *opaque, hwaddr addr)
> +static void pflash_be_writefn(void *opaque, hwaddr addr,
> +                              uint64_t value, unsigned size)
>  {
> -    return pflash_read(opaque, addr, 1, 0);
> +    pflash_write(opaque, addr, value, size, 1);
>  }
>  
> -static uint32_t pflash_readw_be(void *opaque, hwaddr addr)
> +static uint64_t pflash_le_readfn(void *opaque, hwaddr addr, unsigned size)
>  {
> -    pflash_t *pfl = opaque;
> -
> -    return pflash_read(pfl, addr, 2, 1);
> +    return pflash_read(opaque, addr, size, 0);
>  }
>  
> -static uint32_t pflash_readw_le(void *opaque, hwaddr addr)
> +static void pflash_le_writefn(void *opaque, hwaddr addr,
> +                              uint64_t value, unsigned size)
>  {
> -    pflash_t *pfl = opaque;
> -
> -    return pflash_read(pfl, addr, 2, 0);
> -}
> -
> -static uint32_t pflash_readl_be(void *opaque, hwaddr addr)
> -{
> -    pflash_t *pfl = opaque;
> -
> -    return pflash_read(pfl, addr, 4, 1);
> -}
> -
> -static uint32_t pflash_readl_le(void *opaque, hwaddr addr)
> -{
> -    pflash_t *pfl = opaque;
> -
> -    return pflash_read(pfl, addr, 4, 0);
> -}
> -
> -static void pflash_writeb_be(void *opaque, hwaddr addr,
> -                             uint32_t value)
> -{
> -    pflash_write(opaque, addr, value, 1, 1);
> -}
> -
> -static void pflash_writeb_le(void *opaque, hwaddr addr,
> -                             uint32_t value)
> -{
> -    pflash_write(opaque, addr, value, 1, 0);
> -}
> -
> -static void pflash_writew_be(void *opaque, hwaddr addr,
> -                             uint32_t value)
> -{
> -    pflash_t *pfl = opaque;
> -
> -    pflash_write(pfl, addr, value, 2, 1);
> -}
> -
> -static void pflash_writew_le(void *opaque, hwaddr addr,
> -                             uint32_t value)
> -{
> -    pflash_t *pfl = opaque;
> -
> -    pflash_write(pfl, addr, value, 2, 0);
> -}
> -
> -static void pflash_writel_be(void *opaque, hwaddr addr,
> -                             uint32_t value)
> -{
> -    pflash_t *pfl = opaque;
> -
> -    pflash_write(pfl, addr, value, 4, 1);
> -}
> -
> -static void pflash_writel_le(void *opaque, hwaddr addr,
> -                             uint32_t value)
> -{
> -    pflash_t *pfl = opaque;
> -
> -    pflash_write(pfl, addr, value, 4, 0);
> +    pflash_write(opaque, addr, value, size, 0);
>  }
>  
>  static const MemoryRegionOps pflash_cfi02_ops_be = {
> -    .old_mmio = {
> -        .read = { pflash_readb_be, pflash_readw_be, pflash_readl_be, },
> -        .write = { pflash_writeb_be, pflash_writew_be, pflash_writel_be, },
> -    },
> +    .read = pflash_be_readfn,
> +    .write = pflash_be_writefn,
> +    .valid.min_access_size = 1,
> +    .valid.max_access_size = 4,
>      .endianness = DEVICE_NATIVE_ENDIAN,
>  };
>  
>  static const MemoryRegionOps pflash_cfi02_ops_le = {
> -    .old_mmio = {
> -        .read = { pflash_readb_le, pflash_readw_le, pflash_readl_le, },
> -        .write = { pflash_writeb_le, pflash_writew_le, pflash_writel_le, },
> -    },
> +    .read = pflash_le_readfn,
> +    .write = pflash_le_writefn,
> +    .valid.min_access_size = 1,
> +    .valid.max_access_size = 4,
>      .endianness = DEVICE_NATIVE_ENDIAN,
>  };
>  
>