From patchwork Fri Jun 14 16:36:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 251463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 45E4E2C0084 for ; Sat, 15 Jun 2013 02:38:27 +1000 (EST) Received: from localhost ([::1]:35400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnX17-0005K3-Dp for incoming@patchwork.ozlabs.org; Fri, 14 Jun 2013 12:38:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnWzp-0003rV-TX for qemu-devel@nongnu.org; Fri, 14 Jun 2013 12:37:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnWzd-0000gB-I5 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 12:37:05 -0400 Received: from mail-pb0-x22e.google.com ([2607:f8b0:400e:c01::22e]:36366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnWzd-0000e7-AD for qemu-devel@nongnu.org; Fri, 14 Jun 2013 12:36:53 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so734262pbb.5 for ; Fri, 14 Jun 2013 09:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=RPz2d7eq9ZRGdWXIsC48TZFwwhFfds7SgoWjkzXpzAM=; b=IqaeHhJ03iSw/VA+bPiQpQ936/xiyNd8tb9QXvalNlsgYFTzFR3NOdROv1x2CkbfAk MiYqK098HTHC2IYNAD4Ey6IfHM64oT9grWmoDB19tDQ+Erdj9gBfai/ul7Lyc8tEe9oB s5RKXuvpwI2RRz1SPuc38bkzP1nFPQtW4VcMVVT1fOZ/eWV3lY62sPQHdm2BGHGzOgCO ZVg2MXteX2EnNAegWFHpirgeu9K+R0D5NbhGw1o1k/EEUQrtuIZAW2ryrEYo0r84FTnr YPD2Ar452Hq6KIJxeJqs3MJJco62aGoG4K5s/ppyITyJ4L+LiH+Rwe3PNblVhALblENa xV8A== X-Received: by 10.68.36.197 with SMTP id s5mr3358230pbj.23.1371227812429; Fri, 14 Jun 2013 09:36:52 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id ix3sm2830767pbc.37.2013.06.14.09.36.50 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 14 Jun 2013 09:36:51 -0700 (PDT) From: Soren Brinkmann To: Paul Brook , Peter Maydell , Paolo Bonzini Date: Fri, 14 Jun 2013 09:36:23 -0700 Message-Id: <1371227783-23086-3-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1371227783-23086-1-git-send-email-soren.brinkmann@xilinx.com> References: <1371227783-23086-1-git-send-email-soren.brinkmann@xilinx.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::22e Cc: Peter Crosthwaite , Edgar Iglesias , Soren Brinkmann , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/2] hw/arm: Use 'load_ramdisk()' for loading ramdisk X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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);