From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 14 Jul 2010 11:58:25 +0000 (+0300)
Subject: kvm: Fix load_bzimage for flat binaries
X-Git-Tag: next-20110824~3^2~528^2~93
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e46b0a8c4eb33cdea4094d04ad0fef3e521327df;p=karo-tx-linux.git

kvm: Fix load_bzimage for flat binaries

We must not die if load_bzimage() fails because we want to fall-back to loading
flat binaries.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index 5c604b4c7eb2..5195dafb144c 100644
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -299,7 +299,7 @@ static bool load_bzimage(struct kvm *self, int fd, const char *kernel_cmdline)
 		die_perror("lseek");
 
 	if (read(fd, &boot, sizeof(boot)) != sizeof(boot))
-		die_perror("read");
+		return false;
 
         if (memcmp(&boot.hdr.header, BZIMAGE_MAGIC, strlen(BZIMAGE_MAGIC)) != 0)
 		return false;