On 10 May 2012 23:40, Andreas Färber <afaer...@suse.de> wrote: > Am 10.05.2012 23:41, schrieb Peter Maydell: >> On 10 May 2012 01:14, Andreas Färber <afaer...@suse.de> wrote: >>> Allows us to use cpu_reset() in place of cpu_state_reset(). >>> >>> Signed-off-by: Andreas Färber <afaer...@suse.de> >>> --- >>> hw/arm_boot.c | 9 ++++++--- >>> 1 files changed, 6 insertions(+), 3 deletions(-) >>> >>> diff --git a/hw/arm_boot.c b/hw/arm_boot.c >>> index 7447f5c..eb2d176 100644 >>> --- a/hw/arm_boot.c >>> +++ b/hw/arm_boot.c > [...] >>> @@ -302,6 +303,7 @@ static void do_cpu_reset(void *opaque) >>> >>> void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info) >>> { >>> + ARMCPU *cpu; >>> int kernel_size; >>> int initrd_size; >>> int n; >> >> This variable could be kept in the more limited scope inside >> the for loop below, right? > > It could. The function currently has a CPUARMState *env argument. That > is supposed to change to ARMCPU *cpu in one of the followup series, in > which case the for loop can reuse that parameter. I generally try to > keep cpu and env close together so that it's visible in diff/grep > context, as explained for your cpu_reset_model_id() series.
Ah, I see. Acked-by: Peter Maydell <peter.mayd...@linaro.org> -- PMM