diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-03-10 00:18:56 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-03-18 11:16:31 +0100 |
| commit | cadf25cfaa8d495c8e642cda49eda074352a8fc8 (patch) | |
| tree | 30c681cc8e2c2b6be97c8547b22492ff4282fa9c | |
| parent | 326d02c34a92f6e30fa3231be83efda43bac36f8 (diff) | |
| download | qemu-cadf25cfaa8d495c8e642cda49eda074352a8fc8.zip qemu-cadf25cfaa8d495c8e642cda49eda074352a8fc8.tar.gz qemu-cadf25cfaa8d495c8e642cda49eda074352a8fc8.tar.bz2 | |
hw/block/pflash_cfi02: Open-code pflash_register_memory(rom=false)
There is only one call to pflash_register_memory() with
rom_mode == false. As we want to modify pflash_register_memory()
in the next patch, open-code this trivial function in place for
the 'rom_mode == false' case.
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-6-philmd@redhat.com>
| -rw-r--r-- | hw/block/pflash_cfi02.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 0eb868e..897b733 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -467,8 +467,10 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value, switch (pfl->wcycle) { case 0: /* Set the device in I/O access mode if required */ - if (pfl->rom_mode) - pflash_register_memory(pfl, 0); + if (pfl->rom_mode) { + pfl->rom_mode = false; + memory_region_rom_device_set_romd(&pfl->orig_mem, false); + } pfl->read_counter = 0; /* We're in read mode */ check_unlock0: |