On Fri, Jul 29, 2016 at 10:42 AM, Peter Maydell
<peter.mayd...@linaro.org> wrote:
> On 14 July 2016 at 01:03, Alistair Francis <alistair.fran...@xilinx.com>
> wrote:
>> Add a new function load_image_targphys_as() that allows the caller
>> to specify an AddressSpace to use when loading a targphys. The
>> original load_image_targphys() function doesn't have any change in
>> functionality.
>>
>> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
>> ---
>>
>> hw/core/loader.c | 10 ++++++++--
>> include/hw/loader.h | 5 +++++
>> 2 files changed, 13 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/core/loader.c b/hw/core/loader.c
>> index 861dbc2..31a2d4a 100644
>> --- a/hw/core/loader.c
>> +++ b/hw/core/loader.c
>> @@ -133,10 +133,16 @@ ssize_t read_targphys(const char *name,
>> return did;
>> }
>>
>> -/* return the size or -1 if error */
>> int load_image_targphys(const char *filename,
>> hwaddr addr, uint64_t max_sz)
>> {
>> + return load_image_targphys_as(filename, addr, max_sz, NULL);
>> +}
>> +
>> +/* return the size or -1 if error */
>> +int load_image_targphys_as(const char *filename,
>> + hwaddr addr, uint64_t max_sz, AddressSpace *as)
>> +{
>> int size;
>>
>> size = get_image_size(filename);
>> @@ -144,7 +150,7 @@ int load_image_targphys(const char *filename,
>> return -1;
>> }
>> if (size > 0) {
>> - rom_add_file_fixed(filename, addr, -1);
>> + rom_add_file_fixed_as(filename, addr, -1, as);
>> }
>> return size;
>> }
>> diff --git a/include/hw/loader.h b/include/hw/loader.h
>> index ede98f6..1a9053f 100644
>> --- a/include/hw/loader.h
>> +++ b/include/hw/loader.h
>> @@ -16,6 +16,9 @@ int load_image(const char *filename, uint8_t *addr); /*
>> deprecated */
>> ssize_t load_image_size(const char *filename, void *addr, size_t size);
>> int load_image_targphys(const char *filename, hwaddr,
>> uint64_t max_sz);
>> +int load_image_targphys_as(const char *filename,
>> + hwaddr addr, uint64_t max_sz, AddressSpace *as);
>> +
>
> Again, code changes are fine but could we have a doc comment?
I have added comments to both.
Thanks,
Alistair
>
> thanks
> -- PMM
>
