From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Herrmann Subject: [PATCH v2 04/12] kvm tools: Allow to load ELF binary Date: Mon, 19 May 2014 18:53:23 +0200 Message-ID: <1400518411-9759-5-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-bn1blp0184.outbound.protection.outlook.com ([207.46.163.184]:39302 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932683AbaESQyu (ORCPT ); Mon, 19 May 2014 12:54:50 -0400 In-Reply-To: <1400518411-9759-1-git-send-email-andreas.herrmann@caviumnetworks.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Andreas Herrmann --- tools/kvm/include/kvm/kvm.h | 1 + tools/kvm/kvm.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h index d05b936..3643fe3 100644 --- a/tools/kvm/include/kvm/kvm.h +++ b/tools/kvm/include/kvm/kvm.h @@ -109,6 +109,7 @@ void *guest_flat_to_host(struct kvm *kvm, u64 offset); u64 host_to_guest_flat(struct kvm *kvm, void *ptr); int load_flat_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, const char *kernel_cmdline); +int load_elf_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, const char *kernel_cmdline); bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, const char *kernel_cmdline); /* diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c index 7bd20d3..cfc0693 100644 --- a/tools/kvm/kvm.c +++ b/tools/kvm/kvm.c @@ -349,6 +349,12 @@ static bool initrd_check(int fd) !memcmp(id, CPIO_MAGIC, 4); } +int __attribute__((__weak__)) load_elf_binary(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) { @@ -375,6 +381,11 @@ bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename, pr_warning("%s is not a bzImage. Trying to load it as a flat binary...", kernel_filename); + ret = load_elf_binary(kvm, fd_kernel, fd_initrd, kernel_cmdline); + + if (ret) + goto found_kernel; + ret = load_flat_binary(kvm, fd_kernel, fd_initrd, kernel_cmdline); if (ret) -- 1.7.9.5