diff options
author | Benjamin Herrenschmidt | 2014-07-21 05:02:03 +0200 |
---|---|---|
committer | Alexander Graf | 2014-09-08 12:50:48 +0200 |
commit | ea87616d6c44d998affef3d3b9fdfc49d14b8150 (patch) | |
tree | 7a44ca5bbe846c46c9709699492d4fd9145ad7e0 /hw/core/loader.c | |
parent | spapr: Fix ibm, associativity for memory nodes (diff) | |
download | qemu-ea87616d6c44d998affef3d3b9fdfc49d14b8150.tar.gz qemu-ea87616d6c44d998affef3d3b9fdfc49d14b8150.tar.xz qemu-ea87616d6c44d998affef3d3b9fdfc49d14b8150.zip |
loader: Add load_image_size() to replace load_image()
A subsequent patch to ppc/spapr needs to load the RTAS blob into
qemu memory rather than target memory (so it can later be copied
into the right spot at machine reset time).
I would use load_image() but it is marked deprecated because it
doesn't take a buffer size as argument, so let's add load_image_size()
that does.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
[aik: fixed errors from checkpatch.pl]
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/core/loader.c')
-rw-r--r-- | hw/core/loader.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c index 193f0f8400..597b117db3 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -89,6 +89,27 @@ int load_image(const char *filename, uint8_t *addr) return size; } +/* return the size or -1 if error */ +ssize_t load_image_size(const char *filename, void *addr, size_t size) +{ + int fd; + ssize_t actsize; + + fd = open(filename, O_RDONLY | O_BINARY); + if (fd < 0) { + return -1; + } + + actsize = read(fd, addr, size); + if (actsize < 0) { + close(fd); + return -1; + } + close(fd); + + return actsize; +} + /* read()-like version */ ssize_t read_targphys(const char *name, int fd, hwaddr dst_addr, size_t nbytes) |