Received: from [140.186.70.92] (port=40049 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OscSf-0007GB-LV for qemu-devel@nongnu.org; Mon, 06 Sep 2010 10:14:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OscSd-0002S0-GI for qemu-devel@nongnu.org; Mon, 06 Sep 2010 10:14:17 -0400 Received: from smtp28.orange.fr ([80.12.242.100]:29732) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OscSd-0002RZ-7Z for qemu-devel@nongnu.org; Mon, 06 Sep 2010 10:14:15 -0400 Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2806.orange.fr (SMTP Server) with ESMTP id DD780700471B for ; Mon, 6 Sep 2010 16:14:12 +0200 (CEST) Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2806.orange.fr (SMTP Server) with ESMTP id CE3E3700011F for ; Mon, 6 Sep 2010 16:14:12 +0200 (CEST) Received: from localhost.localdomain (AToulouse-159-1-51-197.w92-134.abo.wanadoo.fr [92.134.82.197]) by mwinf2806.orange.fr (SMTP Server) with ESMTP id 897A1700324C for ; Mon, 6 Sep 2010 16:14:12 +0200 (CEST) From: Daniel Lezcano Date: Mon, 6 Sep 2010 16:12:52 +0200 Message-Id: <1283782373-4797-3-git-send-email-daniel.lezcano@free.fr> In-Reply-To: <1283782373-4797-1-git-send-email-daniel.lezcano@free.fr> References: <1283782373-4797-1-git-send-email-daniel.lezcano@free.fr> Subject: [Qemu-devel] [rfc 2/3] arm : factor out set_kernel_args[_old] List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 'initrd_size' and 'base' are already present in the 'info' structure, passing them as parameter is redundant with the first parameter. Signed-off-by: Daniel Lezcano --- hw/arm_boot.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 50ec717..16a33af 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -49,12 +49,12 @@ static uint32_t smpboot[] = { p += 4; \ } while (0) -static void set_kernel_args(struct arm_boot_info *info, - int initrd_size, target_phys_addr_t base) +static void set_kernel_args(struct arm_boot_info *info) { - target_phys_addr_t p; + target_phys_addr_t base = info->loader_start; + target_phys_addr_t p = base + KERNEL_ARGS_ADDR; + int initrd_size = info->initrd_size; - p = base + KERNEL_ARGS_ADDR; /* ATAG_CORE */ WRITE_WORD(p, 5); WRITE_WORD(p, 0x54410001); @@ -102,15 +102,14 @@ static void set_kernel_args(struct arm_boot_info *info, WRITE_WORD(p, 0); } -static void set_kernel_args_old(struct arm_boot_info *info, - int initrd_size, target_phys_addr_t base) +static void set_kernel_args_old(struct arm_boot_info *info) { - target_phys_addr_t p; + target_phys_addr_t base = info->loader_start; + /* see linux/include/asm-arm/setup.h */ + target_phys_addr_t p = base + KERNEL_ARGS_ADDR; + int initrd_size = info->initrd_size; const char *s; - - /* see linux/include/asm-arm/setup.h */ - p = base + KERNEL_ARGS_ADDR; /* page_size */ WRITE_WORD(p, 4096); /* nr_pages */ @@ -188,12 +187,7 @@ static void main_cpu_reset(void *opaque) env->thumb = info->entry & 1; } else { env->regs[15] = info->loader_start; - if (old_param) { - set_kernel_args_old(info, info->initrd_size, - info->loader_start); - } else { - set_kernel_args(info, info->initrd_size, info->loader_start); - } + old_param ? set_kernel_args_old(info): set_kernel_args(info); } } /* TODO: Reset secondary CPUs. */ -- 1.7.0.4