diff mbox

[v9,2/8] loader: Use the specified MemoryRegion

Message ID ac9e812d6a1231d4ca9ce30e42daeffe3e39b48e.1468454556.git.alistair.francis@xilinx.com
State New
Headers show

Commit Message

Alistair Francis July 14, 2016, 12:03 a.m. UTC 
Prevously the specified MemoryRegion was ignored during the rom register
reset. This patch uses the rom MemoryRegion is avaliable.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---

 hw/core/loader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Peter Maydell July 29, 2016, 5:34 p.m. UTC | #1 
On 14 July 2016 at 01:03, Alistair Francis <alistair.francis@xilinx.com> wrote:
> Prevously the specified MemoryRegion was ignored during the rom register
> reset. This patch uses the rom MemoryRegion is avaliable.

"if available"

>
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> ---

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM
diff mbox

Patch

diff --git a/hw/core/loader.c b/hw/core/loader.c
index 53e0e41..6b61f29 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -1045,7 +1045,8 @@  int rom_check_and_register_reset(void)
         }
         addr  = rom->addr;
         addr += rom->romsize;
-        section = memory_region_find(get_system_memory(), rom->addr, 1);
+        section = memory_region_find(rom->mr ? rom->mr : get_system_memory(),
+                                     rom->addr, 1);
         rom->isrom = int128_nz(section.size) && memory_region_is_rom(section.mr);
         memory_region_unref(section.mr);
     }