Re: [PATCH v2 04/12] hw/block/pflash_cfi02: Set rom_mode to true in pflash_setup_mappings()

[David Edmondson]

On Wednesday, 2021-03-10 at 18:05:20 +01, Philippe Mathieu-Daudé wrote:

> There is only one call to pflash_setup_mappings(). Convert 'rom_mode'
> to boolean and set it to true directly within pflash_setup_mappings().
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: David Edmondson <david.edmondson@oracle.com>

> ---
> v2: Convert to bool in pflash_register_memory (David)
> ---
>  hw/block/pflash_cfi02.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
> index 845f50ed99b..0eb868ecd3d 100644
> --- a/hw/block/pflash_cfi02.c
> +++ b/hw/block/pflash_cfi02.c
> @@ -108,7 +108,7 @@ struct PFlashCFI02 {
>      MemoryRegion mem;
>      MemoryRegion *mem_mappings;    /* array; one per mapping */
>      MemoryRegion orig_mem;
> -    int rom_mode;
> +    bool rom_mode;
>      int read_counter; /* used for lazy switch-back to rom mode */
>      int sectors_to_erase;
>      uint64_t erase_time_remaining;
> @@ -181,12 +181,13 @@ static void pflash_setup_mappings(PFlashCFI02 *pfl)
>                                   "pflash-alias", &pfl->orig_mem, 0, size);
>          memory_region_add_subregion(&pfl->mem, i * size, 
> &pfl->mem_mappings[i]);
>      }
> +    pfl->rom_mode = true;
>  }
>  
>  static void pflash_register_memory(PFlashCFI02 *pfl, int rom_mode)
>  {
>      memory_region_rom_device_set_romd(&pfl->orig_mem, rom_mode);
> -    pfl->rom_mode = rom_mode;
> +    pfl->rom_mode = !!rom_mode;
>  }
>  
>  static size_t pflash_regions_count(PFlashCFI02 *pfl)
> @@ -927,7 +928,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Error 
> **errp)
>      pfl->sector_erase_map = bitmap_new(pfl->total_sectors);
>  
>      pflash_setup_mappings(pfl);
> -    pfl->rom_mode = 1;
>      sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem);
>  
>      timer_init_ns(&pfl->timer, QEMU_CLOCK_VIRTUAL, pflash_timer, pfl);
> -- 
> 2.26.2

dme.
-- 
Everyone I know, goes away in the end.