From patchwork Tue Dec 4 11:14:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Thierry X-Patchwork-Id: 10711535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 272F418A7 for ; Tue, 4 Dec 2018 11:14:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A2362B3A1 for ; Tue, 4 Dec 2018 11:14:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EFD92B6DD; Tue, 4 Dec 2018 11:14:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B47942B3B0 for ; Tue, 4 Dec 2018 11:14:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728484AbeLDLOn (ORCPT ); Tue, 4 Dec 2018 06:14:43 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:57670 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727419AbeLDLOn (ORCPT ); Tue, 4 Dec 2018 06:14:43 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BC425A78; Tue, 4 Dec 2018 03:14:42 -0800 (PST) Received: from e112298-lin.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8A30E3F59C; Tue, 4 Dec 2018 03:14:41 -0800 (PST) From: Julien Thierry To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Cc: will.deacon@arm.com, Sami.Mujawar@arm.com, Mark.Rutland@arm.com, Julien Thierry Subject: [PATCH kvmtool 2/6] arm: Move firmware function Date: Tue, 4 Dec 2018 11:14:29 +0000 Message-Id: <1543922073-55530-3-git-send-email-julien.thierry@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1543922073-55530-1-git-send-email-julien.thierry@arm.com> References: <1543922073-55530-1-git-send-email-julien.thierry@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Firmware loading/setup function are in fdt file while it is not very related to this. Move them to the file that does the main init/setup for memory. Signed-off-by: Julien Thierry Reviewed-by: Andre Przywara --- arm/fdt.c | 10 ---------- arm/kvm.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arm/fdt.c b/arm/fdt.c index 980015b..664bb62 100644 --- a/arm/fdt.c +++ b/arm/fdt.c @@ -14,16 +14,6 @@ #include #include -bool kvm__load_firmware(struct kvm *kvm, const char *firmware_filename) -{ - return false; -} - -int kvm__arch_setup_firmware(struct kvm *kvm) -{ - return 0; -} - static void dump_fdt(const char *dtb_file, void *fdt) { int count, fd; diff --git a/arm/kvm.c b/arm/kvm.c index b824f63..c6843e5 100644 --- a/arm/kvm.c +++ b/arm/kvm.c @@ -168,3 +168,13 @@ bool kvm__arch_load_kernel_image(struct kvm *kvm, int fd_kernel, int fd_initrd, return true; } + +bool kvm__load_firmware(struct kvm *kvm, const char *firmware_filename) +{ + return false; +} + +int kvm__arch_setup_firmware(struct kvm *kvm) +{ + return 0; +}