[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/11] hw/block/pflash_cfi02: Set rom_mode to true in pflash_setup
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 04/11] hw/block/pflash_cfi02: Set rom_mode to true in pflash_setup_mappings() |
Date: |
Tue, 16 Mar 2021 00:35:20 +0100 |
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>
Message-Id: <20210310170528.1184868-5-philmd@redhat.com>
---
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
- [PULL 00/11] pflash patches for 2021-03-16, Philippe Mathieu-Daudé, 2021/03/15
- [PULL 01/11] hw/block/pflash_cfi: Fix code style for checkpatch.pl, Philippe Mathieu-Daudé, 2021/03/15
- [PULL 02/11] hw/block/pflash_cfi01: Extract pflash_cfi01_fill_cfi_table(), Philippe Mathieu-Daudé, 2021/03/15
- [PULL 03/11] hw/block/pflash_cfi02: Extract pflash_cfi02_fill_cfi_table(), Philippe Mathieu-Daudé, 2021/03/15
- [PULL 04/11] hw/block/pflash_cfi02: Set rom_mode to true in pflash_setup_mappings(),
Philippe Mathieu-Daudé <=
- [PULL 05/11] hw/block/pflash_cfi02: Open-code pflash_register_memory(rom=false), Philippe Mathieu-Daudé, 2021/03/15
- [PULL 06/11] hw/block/pflash_cfi02: Rename register_memory(true) as mode_read_array, Philippe Mathieu-Daudé, 2021/03/15
- [PULL 07/11] hw/block/pflash_cfi02: Factor out pflash_reset_state_machine(), Philippe Mathieu-Daudé, 2021/03/15
- [PULL 08/11] hw/block/pflash_cfi02: Add DeviceReset method, Philippe Mathieu-Daudé, 2021/03/15
- [PULL 09/11] hw/block/pflash_cfi01: Clarify trace events, Philippe Mathieu-Daudé, 2021/03/15
- [PULL 10/11] hw/block/pflash_cfi01: Correct the type of PFlashCFI01.ro, Philippe Mathieu-Daudé, 2021/03/15
- [PULL 11/11] hw/block/pflash_cfi: Replace DPRINTF with trace events, Philippe Mathieu-Daudé, 2021/03/15
- Re: [PULL 00/11] pflash patches for 2021-03-16, Peter Maydell, 2021/03/17