From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEh-0003mm-97 for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPvEa-0002k5-FB for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:39 -0400 Received: from mail-we0-f172.google.com ([74.125.82.172]:43844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEa-0002jn-2F for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:32 -0400 Received: by mail-we0-f172.google.com with SMTP id q59so11968051wes.17 for ; Fri, 05 Sep 2014 08:15:28 -0700 (PDT) From: Ard Biesheuvel Date: Fri, 5 Sep 2014 17:15:22 +0200 Message-Id: <1409930126-28449-3-git-send-email-ard.biesheuvel@linaro.org> In-Reply-To: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> References: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [Qemu-devel] [PATCH 2/6] hw/arm/boot: return size of loaded DTB from load_dtb() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: fu.wei@linaro.org, christoffer.dall@linaro.org, Ard Biesheuvel Add a dtb_size output parameter to load_dtb() so that we can find out what its memory footprint is. Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e32f2f415885..c103a8fdc941 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -312,7 +312,8 @@ static void set_kernel_args_old(const struct arm_boot_info *info) } } -static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) +static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, + uint32_t *dtb_size) { void *fdt = NULL; int size, rc; @@ -340,6 +341,9 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) goto fail; } } + if (dtb_size != NULL) { + *dtb_size = size; + } acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells"); scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells"); @@ -569,7 +573,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 (load_dtb(dtb_start, info, NULL)) { exit(1); } fixupcontext[FIXUP_ARGPTR] = dtb_start; -- 1.8.3.2