From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsEhC-0003Hm-Vb for qemu-devel@nongnu.org; Fri, 20 Jul 2012 11:00:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsEh6-0006Zi-1V for qemu-devel@nongnu.org; Fri, 20 Jul 2012 11:00:46 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:57948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsEh5-0006Wi-QN for qemu-devel@nongnu.org; Fri, 20 Jul 2012 11:00:39 -0400 From: Peter Maydell Date: Fri, 20 Jul 2012 16:00:23 +0100 Message-Id: <1342796430-16636-4-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1342796430-16636-1-git-send-email-peter.maydell@linaro.org> References: <1342796430-16636-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 03/10] hw/arm_boot.c: Consistently use ram_size from arm_boot_info struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , Blue Swirl Cc: qemu-devel@nongnu.org, Paul Brook Clean up the mix of getting the RAM size from the global ram_size and from the ram_size field in the arm_boot_info structure, so that we always use the structure field. Signed-off-by: Peter Maydell Reviewed-by: Peter A. G. Crosthwaite --- hw/arm_boot.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm_boot.c b/hw/arm_boot.c index a1e6ddb..29ae324 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -357,7 +357,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) if (kernel_size < 0) { entry = info->loader_start + KERNEL_LOAD_ADDR; kernel_size = load_image_targphys(info->kernel_filename, entry, - ram_size - KERNEL_LOAD_ADDR); + info->ram_size - KERNEL_LOAD_ADDR); is_linux = 1; } if (kernel_size < 0) { @@ -371,7 +371,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) initrd_size = load_image_targphys(info->initrd_filename, info->loader_start + INITRD_LOAD_ADDR, - ram_size - INITRD_LOAD_ADDR); + info->ram_size + - INITRD_LOAD_ADDR); if (initrd_size < 0) { fprintf(stderr, "qemu: could not load initrd '%s'\n", info->initrd_filename); -- 1.7.5.4