From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGGR-0001Y9-5O for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:55:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRGGL-00076r-7j for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:54:59 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:52152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGGL-00076e-2C for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:54:53 -0400 Received: by mail-wg0-f47.google.com with SMTP id y10so2228587wgg.18 for ; Tue, 09 Sep 2014 00:54:52 -0700 (PDT) From: Eric Auger Date: Tue, 9 Sep 2014 08:54:31 +0100 Message-Id: <1410249273-6063-5-git-send-email-eric.auger@linaro.org> In-Reply-To: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> References: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> Subject: [Qemu-devel] [PATCH v3 4/6] hw/arm/boot: load_dtb becomes non static arm_load_dtb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: patches@linaro.org, eric.auger@linaro.org, will.deacon@arm.com, stuart.yoder@freescale.com, Bharat.Bhushan@freescale.com, alex.williamson@redhat.com, a.motakis@virtualopensystems.com, kvmarm@lists.cs.columbia.edu load_dtb is renamed into arm_load_dtb and becomes non static. it will be used by machvirt for dynamic instantiation of platform devices Signed-off-by: Eric Auger --- v2 -> v3: load_dtb renamed into arm_load_dtb --- hw/arm/boot.c | 4 ++-- include/hw/arm/arm.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e32f2f4..79fe0f1 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -312,7 +312,7 @@ static void set_kernel_args_old(const struct arm_boot_info *info) } } -static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) +int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo) { void *fdt = NULL; int size, rc; @@ -569,7 +569,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) */ hwaddr dtb_start = QEMU_ALIGN_UP(info->initrd_start + initrd_size, 4096); - if (load_dtb(dtb_start, info)) { + if (arm_load_dtb(dtb_start, info)) { exit(1); } fixupcontext[FIXUP_ARGPTR] = dtb_start; diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index cefc9e6..e60c4c0 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -68,6 +68,7 @@ struct arm_boot_info { hwaddr entry; }; void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info); +int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo); /* Multiplication factor to convert from system clock ticks to qemu timer ticks. */ -- 1.8.3.2