From: pbrook Date: Wed, 17 Jan 2007 08:59:26 +0000 (+0000) Subject: ARM boot fix (Jason Wessel). X-Git-Tag: release_0_9_1~1572 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=591ef7f0e26c08b5e3fb39a0a7de991598f76d23;p=qemu-xen-4.5-testing.git ARM boot fix (Jason Wessel). --- diff --git a/hw/arm_boot.c b/hw/arm_boot.c index f62f0f6fa..28f6a9262 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -80,12 +80,12 @@ void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename, } kernel_size = load_elf(kernel_filename, 0, &entry); - if (kernel_size) { + if (kernel_size >= 0) { /* An ELF image. Jump to the entry point. */ env->regs[15] = entry & 0xfffffffe; env->thumb = entry & 1; } else { - /* Raw binary image. Assume it is a Limux zImage. */ + /* Raw binary image. Assume it is a Linux zImage. */ kernel_size = load_image(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR); if (kernel_size < 0) {