On Fri, Jul 6, 2012 at 3:00 AM, Peter Maydell <peter.mayd...@linaro.org> wrote:
> 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 <peter.mayd...@linaro.org>
Reviewed-by: Peter A. G. Crosthwaite <peter.crosthwa...@petalogix.com>
> ---
> 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);
No blocker, but can we de-indent one or two tabs, to not have to have
this arg split this across so many lines?
> if (initrd_size < 0) {
> fprintf(stderr, "qemu: could not load initrd '%s'\n",
> info->initrd_filename);
> --
> 1.7.1
>
