mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: Add new load_ramdisk_as()

Browse Source 
Add a function load_ramdisk_as() which behaves like the existing
load_ramdisk() but allows the caller to specify the AddressSpace
to use. This matches the pattern we have already for various
other loader functions.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180220180325.29818-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-03-02 10:45:35 +00:00
parent 768055980b
commit 97df5feee3
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/core/loader.c
View File

@ -729,9 +729,15 @@ int load_uimage_as(const char *filename, hwaddr *ep, hwaddr *loadaddr,
/* Load a ramdisk. */ /* Load a ramdisk. */
int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz) int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz)
{
return load_ramdisk_as(filename, addr, max_sz, NULL);
}
int load_ramdisk_as(const char *filename, hwaddr addr, uint64_t max_sz,
AddressSpace *as)
{ {
return load_uboot_image(filename, NULL, &addr, NULL, IH_TYPE_RAMDISK, return load_uboot_image(filename, NULL, &addr, NULL, IH_TYPE_RAMDISK,
NULL, NULL, NULL); NULL, NULL, as);
} }
/* Load a gzip-compressed kernel to a dynamically allocated buffer. */ /* Load a gzip-compressed kernel to a dynamically allocated buffer. */

12
include/hw/loader.h
View File

@ -162,16 +162,26 @@ int load_uimage(const char *filename, hwaddr *ep,
void *translate_opaque); void *translate_opaque);
/** /**
* load_ramdisk: * load_ramdisk_as:
* @filename: Path to the ramdisk image * @filename: Path to the ramdisk image
* @addr: Memory address to load the ramdisk to * @addr: Memory address to load the ramdisk to
* @max_sz: Maximum allowed ramdisk size (for non-u-boot ramdisks) * @max_sz: Maximum allowed ramdisk size (for non-u-boot ramdisks)
* @as: The AddressSpace to load the ELF to. The value of address_space_memory
* is used if nothing is supplied here.
* *
* Load a ramdisk image with U-Boot header to the specified memory * Load a ramdisk image with U-Boot header to the specified memory
* address. * address.
* *
* Returns the size of the loaded image on success, -1 otherwise. * Returns the size of the loaded image on success, -1 otherwise.
*/ */
int load_ramdisk_as(const char *filename, hwaddr addr, uint64_t max_sz,
AddressSpace *as);
/**
* load_ramdisk:
* Same as load_ramdisk_as(), but doesn't allow the caller to specify
* an AddressSpace.
*/
int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz); int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz);
ssize_t gunzip(void *dst, size_t dstlen, uint8_t *src, size_t srclen); ssize_t gunzip(void *dst, size_t dstlen, uint8_t *src, size_t srclen);