| Message ID | 1418814887-3523-6-git-send-email-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Dec 17, 2014 at 11:14:47AM +0000, Andre Przywara wrote: > 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@arm.com> > --- > tools/kvm/kvm.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c > index e1b9f6c..21817c3 100644 > --- a/tools/kvm/kvm.c > +++ b/tools/kvm/kvm.c > @@ -380,12 +380,15 @@ 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); > + pr_warning("%s is not a bzImage. Trying to load it as an ELF or flat binary...", > + kernel_filename); > +#endif I don't think you need to change the string (at least, that seems to be an unrelated change). Will -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c index e1b9f6c..21817c3 100644 --- a/tools/kvm/kvm.c +++ b/tools/kvm/kvm.c @@ -380,12 +380,15 @@ 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); + pr_warning("%s is not a bzImage. Trying to load it as an ELF or flat binary...", + kernel_filename); +#endif ret = load_elf_binary(kvm, fd_kernel, fd_initrd, kernel_cmdline);
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@arm.com> --- tools/kvm/kvm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)