ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm: Remove redundant arguments from set_kernel_args* 

The parameters initrd_size and base are already included
in the info parameter, so there is no need to pass them
separately.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>,
This commit is contained in:
Stefan Weil 2012-01-29 08:52:15 +01:00 committed by Andrzej Zaborowski
parent 4f56da61b9
commit 761c9eb0fa
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/arm_boot.c
View File

@ -81,9 +81,10 @@ static void default_reset_secondary(CPUState *env,
p += 4; \ p += 4; \
} while (0) } while (0)
static void set_kernel_args(const struct arm_boot_info *info, static void set_kernel_args(const struct arm_boot_info *info)
int initrd_size, target_phys_addr_t base)
{ {
int initrd_size = info->initrd_size;
target_phys_addr_t base = info->loader_start;
target_phys_addr_t p; target_phys_addr_t p;
p = base + KERNEL_ARGS_ADDR; p = base + KERNEL_ARGS_ADDR;
@ -134,12 +135,12 @@ static void set_kernel_args(const struct arm_boot_info *info,
WRITE_WORD(p, 0); WRITE_WORD(p, 0);
} }
static void set_kernel_args_old(const struct arm_boot_info *info, static void set_kernel_args_old(const struct arm_boot_info *info)
int initrd_size, target_phys_addr_t base)
{ {
target_phys_addr_t p; target_phys_addr_t p;
const char *s; const char *s;
int initrd_size = info->initrd_size;
target_phys_addr_t base = info->loader_start;
/* see linux/include/asm-arm/setup.h */ /* see linux/include/asm-arm/setup.h */
p = base + KERNEL_ARGS_ADDR; p = base + KERNEL_ARGS_ADDR;
@ -222,11 +223,9 @@ static void do_cpu_reset(void *opaque)
if (env == first_cpu) { if (env == first_cpu) {
env->regs[15] = info->loader_start; env->regs[15] = info->loader_start;
if (old_param) { if (old_param) {
set_kernel_args_old(info, info->initrd_size, set_kernel_args_old(info);
info->loader_start);
} else { } else {
set_kernel_args(info, info->initrd_size, set_kernel_args(info);
info->loader_start);
} }
} else { } else {
info->secondary_cpu_reset_hook(env, info); info->secondary_cpu_reset_hook(env, info);