Commit-ID: 75cd5265685029735e71d4262e8a1fabf807b036
Gitweb: http://git.kernel.org/tip/75cd5265685029735e71d4262e8a1fabf807b036
Author: Andreas Herrmann <andreas.herrmann@xxxxxxxxxxxxxxxxxx>
AuthorDate: Wed, 28 May 2014 22:27:59 +0200
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Fri, 30 May 2014 21:36:57 +0300
kvm tools: Introduce weak (default) load_bzimage function
... to get rid of its function definition from archs that don't
support it.
Signed-off-by: Andreas Herrmann <andreas.herrmann@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/arm/fdt.c | 7 -------
tools/kvm/kvm.c | 6 ++++++
tools/kvm/powerpc/kvm.c | 7 -------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/tools/kvm/arm/fdt.c b/tools/kvm/arm/fdt.c
index 30cd75a..186a718 100644
--- a/tools/kvm/arm/fdt.c
+++ b/tools/kvm/arm/fdt.c
@@ -276,10 +276,3 @@ int load_flat_binary(struct kvm *kvm, int fd_kernel, int fd_initrd,
return true;
}
-
-bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd,
- const char *kernel_cmdline)
-{
- /* To b or not to b? That is the zImage. */
- return false;
-}
diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index cfc0693..6046434 100644
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -355,6 +355,12 @@ int __attribute__((__weak__)) load_elf_binary(struct kvm *kvm, int fd_kernel,
return false;
}
+bool __attribute__((__weak__)) load_bzimage(struct kvm *kvm, int fd_kernel,
+ int fd_initrd, const char *kernel_cmdline)
+{
+ return false;
+}
+
bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename,
const char *initrd_filename, const char *kernel_cmdline)
{
diff --git a/tools/kvm/powerpc/kvm.c b/tools/kvm/powerpc/kvm.c
index c1712cf..2b03a12 100644
--- a/tools/kvm/powerpc/kvm.c
+++ b/tools/kvm/powerpc/kvm.c
@@ -204,13 +204,6 @@ int load_flat_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, const char *
return true;
}
-bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd,
- const char *kernel_cmdline)
-{
- /* We don't support bzImages. */
- return false;
-}
-
struct fdt_prop {
void *value;
int size;
--
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
|