From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Herrmann Subject: [PATCH v2 05/12] kvm tools: Introduce weak (default) load_bzimage function Date: Mon, 19 May 2014 18:53:24 +0200 Message-ID: <1400518411-9759-6-git-send-email-andreas.herrmann@caviumnetworks.com> References: <1400518411-9759-1-git-send-email-andreas.herrmann@caviumnetworks.com> Mime-Version: 1.0 Content-Type: text/plain Cc: David Daney , Andreas Herrmann , , , James Hogan To: Pekka Enberg Return-path: Received: from mail-bl2lp0211.outbound.protection.outlook.com ([207.46.163.211]:14124 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932683AbaESQzN (ORCPT ); Mon, 19 May 2014 12:55:13 -0400 In-Reply-To: <1400518411-9759-1-git-send-email-andreas.herrmann@caviumnetworks.com> Sender: kvm-owner@vger.kernel.org List-ID: ... to get rid of its function definition from archs that don't support it. Signed-off-by: Andreas Herrmann --- 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; -- 1.7.9.5