Patchwork [v2] use an unsigned long for the max_sz parameter in load_image_targphys

login
register
mail settings
Submitter Mark Langsdorf
Date March 9, 2012, 2:01 p.m.
Message ID <1331301690-4526-1-git-send-email-mark.langsdorf@calxeda.com>
Download mbox | patch
Permalink /patch/145719/
State New
Headers show

Comments

Mark Langsdorf - March 9, 2012, 2:01 p.m.
Allow load_image_targphys to load files on systems with more than 2G of
emulated memory by changing the max_sz parameter from an int to an
unsigned long.

Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
---
The other loaders in hw/loader.h did not look they had a similar issue.

Changes from v1
	changed max_sz from unsigned long to target_phys_addr_t
	returned size to an int to match get_image_size

 hw/loader.c |    2 +-
 hw/loader.h |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
Markus Armbruster - March 9, 2012, 2:31 p.m.
Mark Langsdorf <mark.langsdorf@calxeda.com> writes:

> Allow load_image_targphys to load files on systems with more than 2G of
> emulated memory by changing the max_sz parameter from an int to an
> unsigned long.

Commit message lies.  Didn't check the patch actually improves things.

Patch

diff --git a/hw/loader.c b/hw/loader.c
index 415cdce..17a8e79 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -103,7 +103,7 @@  ssize_t read_targphys(const char *name,
 
 /* return the size or -1 if error */
 int load_image_targphys(const char *filename,
-			target_phys_addr_t addr, int max_sz)
+                        target_phys_addr_t addr, target_phys_addr_t max_sz)
 {
     int size;
 
diff --git a/hw/loader.h b/hw/loader.h
index fbcaba9..79afb94 100644
--- a/hw/loader.h
+++ b/hw/loader.h
@@ -4,7 +4,8 @@ 
 /* loader.c */
 int get_image_size(const char *filename);
 int load_image(const char *filename, uint8_t *addr); /* deprecated */
-int load_image_targphys(const char *filename, target_phys_addr_t, int max_sz);
+int load_image_targphys(const char *filename, target_phys_addr_t,
+                        target_phys_addr_t max_sz);
 int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
              void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
              uint64_t *highaddr, int big_endian, int elf_machine,