From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Und2H-0008R8-R7 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 19:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Und2D-0004vf-M0 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 19:04:01 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:65417) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Und2D-0004ul-G3 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 19:03:57 -0400 Received: by mail-pd0-f169.google.com with SMTP id y10so1008731pdj.28 for ; Fri, 14 Jun 2013 16:03:56 -0700 (PDT) Sender: =?UTF-8?Q?S=C3=B6ren_Brinkmann?= From: Soren Brinkmann Date: Fri, 14 Jun 2013 16:03:32 -0700 Message-Id: <1371251012-25207-3-git-send-email-soren.brinkmann@xilinx.com> In-Reply-To: <1371251012-25207-1-git-send-email-soren.brinkmann@xilinx.com> References: <1371251012-25207-1-git-send-email-soren.brinkmann@xilinx.com> Subject: [Qemu-devel] [PATCH v2 2/2] hw/arm: Use 'load_ramdisk()' for loading ramdisk List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook , Peter Maydell , Paolo Bonzini Cc: Peter Crosthwaite , Edgar Iglesias , Soren Brinkmann , qemu-devel@nongnu.org The load_ramdisk function takes over loading traditional ramdisks images and does also load ramdisks with u-boot header. Signed-off-by: Soren Brinkmann --- hw/arm/boot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index f310f73..ab2b234 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -436,10 +436,10 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) info->entry = entry; if (is_linux) { if (info->initrd_filename) { - initrd_size = load_image_targphys(info->initrd_filename, - info->initrd_start, - info->ram_size - - info->initrd_start); + initrd_size = load_ramdisk(info->initrd_filename, + info->initrd_start, + info->ram_size - + info->initrd_start); if (initrd_size < 0) { fprintf(stderr, "qemu: could not load initrd '%s'\n", info->initrd_filename); -- 1.8.3.1