Commit-ID: a3e73e98bdf70ccf45fad73c1464ca7a3ea14bce
Gitweb: http://git.kernel.org/tip/a3e73e98bdf70ccf45fad73c1464ca7a3ea14bce
Author: Andre Przywara <andre.przywara@xxxxxxx>
AuthorDate: Wed, 17 Dec 2014 15:40:48 +0000
Committer: Will Deacon <will.deacon@xxxxxxx>
CommitDate: Wed, 17 Dec 2014 15:57:47 +0000
kvmtool: remove warning about bzImage on non-x86 architectures
Among the architectures supported by kvmtool, only x86 defines a
bzImage format. So we shouldn't bother users of other architectures
with a message about something that cannot work.
Make the bzImage check dependent on compiling for x86.
Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
---
tools/kvm/kvm.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index e1b9f6c..05064b6 100644
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -380,12 +380,14 @@ bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename,
die("%s is not an initrd", initrd_filename);
}
+#ifdef CONFIG_X86
ret = load_bzimage(kvm, fd_kernel, fd_initrd, kernel_cmdline);
if (ret)
goto found_kernel;
pr_warning("%s is not a bzImage. Trying to load it as a flat binary...", kernel_filename);
+#endif
ret = load_elf_binary(kvm, fd_kernel, fd_initrd, kernel_cmdline);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|