aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-04-26 22:05:26 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-04-26 22:05:26 +0000
commit9ee3c029425a20ed16831c92c4cb3e192a909a61 (patch)
treee0e3273a5c80f8ab35a1073c0582a4b38161ff8e /hw
parent94ac51588972366287fa359a1e7d37b5e08f9bef (diff)
downloadqemu-9ee3c029425a20ed16831c92c4cb3e192a909a61.zip
qemu-9ee3c029425a20ed16831c92c4cb3e192a909a61.tar.gz
qemu-9ee3c029425a20ed16831c92c4cb3e192a909a61.tar.bz2
added entry parameter to ELF loader
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1859 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/sun4m.c4
-rw-r--r--hw/sun4u.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 014ed09..3619005 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -269,7 +269,7 @@ static void sun4m_init(int ram_size, int vga_ram_size, int boot_device,
prom_offset | IO_MEM_ROM);
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEE);
- ret = load_elf(buf, 0);
+ ret = load_elf(buf, 0, NULL);
if (ret < 0) {
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEB);
ret = load_image(buf, phys_ram_base + prom_offset);
@@ -282,7 +282,7 @@ static void sun4m_init(int ram_size, int vga_ram_size, int boot_device,
kernel_size = 0;
if (linux_boot) {
- kernel_size = load_elf(kernel_filename, -0xf0000000);
+ kernel_size = load_elf(kernel_filename, -0xf0000000, NULL);
if (kernel_size < 0)
kernel_size = load_aout(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR);
if (kernel_size < 0)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index bb40697..208d3dd 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -283,7 +283,7 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
prom_offset | IO_MEM_ROM);
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEE);
- ret = load_elf(buf, 0);
+ ret = load_elf(buf, 0, NULL);
if (ret < 0) {
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEB);
ret = load_image(buf, phys_ram_base + prom_offset);
@@ -298,7 +298,7 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
initrd_size = 0;
if (linux_boot) {
/* XXX: put correct offset */
- kernel_size = load_elf(kernel_filename, 0);
+ kernel_size = load_elf(kernel_filename, 0, NULL);
if (kernel_size < 0)
kernel_size = load_aout(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR);
if (kernel_size < 0)