[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/6] hw/arm_boot.c: Consistently use ram_size fro
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 2/6] hw/arm_boot.c: Consistently use ram_size from arm_boot_info struct |
Date: |
Mon, 16 Jul 2012 14:24:12 +0100 |
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 <address@hidden>
Reviewed-by: Peter A. G. Crosthwaite <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/6] arm_boot/vexpress-a15: Support >4GB of RAM, Peter Maydell, 2012/07/16
- [Qemu-devel] [PATCH v2 6/6] hw/vexpress.c: Allow >4GB of RAM for Cortex-A15 daughterboard, Peter Maydell, 2012/07/16
- [Qemu-devel] [PATCH v2 1/6] hw/arm_boot.c: Make ram_size a uint64_t, Peter Maydell, 2012/07/16
- [Qemu-devel] [PATCH v2 4/6] device_tree: Add support for reading device tree properties, Peter Maydell, 2012/07/16
- [Qemu-devel] [PATCH v2 2/6] hw/arm_boot.c: Consistently use ram_size from arm_boot_info struct,
Peter Maydell <=
- [Qemu-devel] [PATCH v2 3/6] hw/arm_boot.c: Check for RAM sizes exceeding ATAGS capacity, Peter Maydell, 2012/07/16
- [Qemu-devel] [PATCH v2 5/6] hw/arm_boot.c: Support DTBs which use 64 bit addresses, Peter Maydell, 2012/07/16