]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
kvm: Fix load_bzimage for flat binaries
authorPekka Enberg <penberg@cs.helsinki.fi>
Wed, 14 Jul 2010 11:58:25 +0000 (14:58 +0300)
committerPekka Enberg <penberg@cs.helsinki.fi>
Wed, 14 Jul 2010 11:58:25 +0000 (14:58 +0300)
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>
tools/kvm/kvm.c

index 5c604b4c7eb25fad9d429869b9a3c788d1ebdfcc..5195dafb144c0bc47b05fb75d0d8aaf9585a4da5 100644 (file)
@@ -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;