From patchwork Mon Oct 29 05:21:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivia Yin X-Patchwork-Id: 194827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5540C2C008D for ; Mon, 29 Oct 2012 17:06:32 +1100 (EST) Received: from localhost ([::1]:47348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSiUY-00019A-Ed for incoming@patchwork.ozlabs.org; Mon, 29 Oct 2012 02:06:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSiUR-00016p-It for qemu-devel@nongnu.org; Mon, 29 Oct 2012 02:06:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSiUQ-0002c3-HK for qemu-devel@nongnu.org; Mon, 29 Oct 2012 02:06:23 -0400 Received: from am1ehsobe006.messaging.microsoft.com ([213.199.154.209]:19499 helo=am1outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSiUN-0002bA-Ex; Mon, 29 Oct 2012 02:06:19 -0400 Received: from mail10-am1-R.bigfish.com (10.3.201.245) by AM1EHSOBE005.bigfish.com (10.3.204.25) with Microsoft SMTP Server id 14.1.225.23; Mon, 29 Oct 2012 06:06:18 +0000 Received: from mail10-am1 (localhost [127.0.0.1]) by mail10-am1-R.bigfish.com (Postfix) with ESMTP id 7F2B8220100; Mon, 29 Oct 2012 06:06:18 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 1 X-BigFish: VS1(z551bizzz1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h1441h1504h1537h1155h) Received: from mail10-am1 (localhost.localdomain [127.0.0.1]) by mail10-am1 (MessageSwitch) id 1351490776994333_18995; Mon, 29 Oct 2012 06:06:16 +0000 (UTC) Received: from AM1EHSMHS021.bigfish.com (unknown [10.3.201.225]) by mail10-am1.bigfish.com (Postfix) with ESMTP id F0B371C0114; Mon, 29 Oct 2012 06:06:16 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS021.bigfish.com (10.3.207.150) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 29 Oct 2012 06:06:16 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.2.318.3; Mon, 29 Oct 2012 06:03:56 +0000 Received: from localhost.localdomain (rock.ap.freescale.net [10.193.20.106]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q9T63iuN008463; Sun, 28 Oct 2012 23:03:55 -0700 From: Olivia Yin To: , Date: Mon, 29 Oct 2012 13:21:33 +0800 Message-ID: <1351488096-22765-3-git-send-email-hong-hua.yin@freescale.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1351488096-22765-2-git-send-email-hong-hua.yin@freescale.com> References: <1351488096-22765-1-git-send-email-hong-hua.yin@freescale.com> <1351488096-22765-2-git-send-email-hong-hua.yin@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-detected-operating-system: by eggs.gnu.org: Windows XP/2000 (RFC1323+, w+, tstamp-) X-Received-From: 213.199.154.209 Cc: Olivia Yin Subject: [Qemu-devel] [RFC PATCH v2 2/5] use reset handlers to reload kernel and initrd 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 Signed-off-by: Olivia Yin --- hw/loader.c | 64 ++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 42 insertions(+), 22 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index cadf58f..9e2c3c8 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -151,7 +151,12 @@ int load_image_targphys(const char *filename, return -1; } if (size > 0) { - rom_add_file_fixed(filename, addr, -1); + ImageFile *image; + image = g_malloc0(sizeof(*image)); + image->name = g_strdup(filename); + image->addr = addr; + + qemu_register_reset(image_file_reset, image); } return size; } @@ -472,15 +477,14 @@ static ssize_t gunzip(void *dst, size_t dstlen, uint8_t *src, return dstbytes; } -/* Load a U-Boot image. */ -int load_uimage(const char *filename, hwaddr *ep, - hwaddr *loadaddr, int *is_linux) +/* write uimage into memory */ +static int uimage_physical_loader(const char *filename, uint8_t **data, + hwaddr *loadaddr) { int fd; int size; uboot_image_header_t h; uboot_image_header_t *hdr = &h; - uint8_t *data = NULL; int ret = -1; fd = open(filename, O_RDONLY | O_BINARY); @@ -513,18 +517,9 @@ int load_uimage(const char *filename, hwaddr *ep, goto out; } - /* TODO: Check CPU type. */ - if (is_linux) { - if (hdr->ih_os == IH_OS_LINUX) - *is_linux = 1; - else - *is_linux = 0; - } - - *ep = hdr->ih_ep; - data = g_malloc(hdr->ih_size); + *data = g_malloc(hdr->ih_size); - if (read(fd, data, hdr->ih_size) != hdr->ih_size) { + if (read(fd, *data, hdr->ih_size) != hdr->ih_size) { fprintf(stderr, "Error reading file\n"); goto out; } @@ -534,11 +529,11 @@ int load_uimage(const char *filename, hwaddr *ep, size_t max_bytes; ssize_t bytes; - compressed_data = data; + compressed_data = *data; max_bytes = UBOOT_MAX_GUNZIP_BYTES; - data = g_malloc(max_bytes); + *data = g_malloc(max_bytes); - bytes = gunzip(data, max_bytes, compressed_data, hdr->ih_size); + bytes = gunzip(*data, max_bytes, compressed_data, hdr->ih_size); g_free(compressed_data); if (bytes < 0) { fprintf(stderr, "Unable to decompress gzipped image!\n"); @@ -547,7 +542,6 @@ int load_uimage(const char *filename, hwaddr *ep, hdr->ih_size = bytes; } - rom_add_blob_fixed(filename, data, hdr->ih_size, hdr->ih_load); if (loadaddr) *loadaddr = hdr->ih_load; @@ -555,12 +549,38 @@ int load_uimage(const char *filename, hwaddr *ep, ret = hdr->ih_size; out: - if (data) - g_free(data); close(fd); return ret; } +static void uimage_reset(void *opaque) +{ + ImageFile *image = opaque; + uint8_t *data = NULL; + int size; + + size = uimage_physical_loader(image->name, &data, &image->addr); + cpu_physical_memory_rw(image->addr, data, size, 1); + g_free(data); +} + +/* Load a U-Boot image. */ +int load_uimage(const char *filename, hwaddr *ep, + hwaddr *loadaddr, int *is_linux) +{ + int size; + ImageFile *image; + uint8_t *data = NULL; + + size= uimage_physical_loader(filename, &data, loadaddr); + g_free(data); + image = g_malloc0(sizeof(*image)); + image->name = g_strdup(filename); + image->addr = *loadaddr; + qemu_register_reset(uimage_reset, image); + return size; +} + /* * Functions for reboot-persistent memory regions. * - used for vga bios and option roms.