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@caviumnetworks.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Andreas Herrmann
2014-05-28 22:27:59 +02:00
committed by Will Deacon
parent f9dee795b9
commit 2be6280702
3 changed files with 6 additions and 14 deletions
-7
View File
@@ -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;
}
+6
View File
@@ -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)
{
-7
View File
@@ -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;