| Message ID | 20181122172653.3413-4-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Avoid cpu_physical_memory_read() in generic code | expand |
On 22/11/18 18:26, Peter Maydell wrote: > Currently the load_elf function in elf_ops.h uses > cpu_physical_memory_write() to write the ELF file to > memory if it is not handling it as a ROM blob. This > means we ignore the AddressSpace that the function > is passed to define where it should be loaded. > Use address_space_write() instead. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > v1->v2: handle NULL as Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/hw/elf_ops.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h > index 81cecaf27e2..74679ff8da3 100644 > --- a/include/hw/elf_ops.h > +++ b/include/hw/elf_ops.h > @@ -482,7 +482,9 @@ static int glue(load_elf, SZ)(const char *name, int fd, > rom_add_elf_program(label, data, file_size, mem_size, > addr, as); > } else { > - cpu_physical_memory_write(addr, data, file_size); > + address_space_write(as ? as : &address_space_memory, > + addr, MEMTXATTRS_UNSPECIFIED, > + data, file_size); > g_free(data); > } > } >
diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index 81cecaf27e2..74679ff8da3 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -482,7 +482,9 @@ static int glue(load_elf, SZ)(const char *name, int fd, rom_add_elf_program(label, data, file_size, mem_size, addr, as); } else { - cpu_physical_memory_write(addr, data, file_size); + address_space_write(as ? as : &address_space_memory, + addr, MEMTXATTRS_UNSPECIFIED, + data, file_size); g_free(data); } }
Currently the load_elf function in elf_ops.h uses cpu_physical_memory_write() to write the ELF file to memory if it is not handling it as a ROM blob. This means we ignore the AddressSpace that the function is passed to define where it should be loaded. Use address_space_write() instead. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- v1->v2: handle NULL as --- include/hw/elf_ops.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)