From patchwork Tue Nov 27 07:07:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivia Yin X-Patchwork-Id: 202107 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 265CB2C0086 for ; Tue, 27 Nov 2012 18:55:59 +1100 (EST) Received: from localhost ([::1]:53021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdG1N-0004Wg-9s for incoming@patchwork.ozlabs.org; Tue, 27 Nov 2012 02:55:57 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdG15-0004KR-Hh for qemu-devel@nongnu.org; Tue, 27 Nov 2012 02:55:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TdG14-00047F-1k for qemu-devel@nongnu.org; Tue, 27 Nov 2012 02:55:39 -0500 Received: from co1ehsobe002.messaging.microsoft.com ([216.32.180.185]:2930 helo=co1outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdG0y-00044O-I8; Tue, 27 Nov 2012 02:55:32 -0500 Received: from mail157-co1-R.bigfish.com (10.243.78.240) by CO1EHSOBE009.bigfish.com (10.243.66.72) with Microsoft SMTP Server id 14.1.225.23; Tue, 27 Nov 2012 07:55:31 +0000 Received: from mail157-co1 (localhost [127.0.0.1]) by mail157-co1-R.bigfish.com (Postfix) with ESMTP id 1881D3600E7; Tue, 27 Nov 2012 07:55:31 +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(z551bizzz1de0h1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h1441h1504h1537h162dh1631h1155h) Received: from mail157-co1 (localhost.localdomain [127.0.0.1]) by mail157-co1 (MessageSwitch) id 1354002928471137_9564; Tue, 27 Nov 2012 07:55:28 +0000 (UTC) Received: from CO1EHSMHS005.bigfish.com (unknown [10.243.78.254]) by mail157-co1.bigfish.com (Postfix) with ESMTP id 67498540061; Tue, 27 Nov 2012 07:55:28 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS005.bigfish.com (10.243.66.15) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 27 Nov 2012 07:55:28 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.318.3; Tue, 27 Nov 2012 07:55:27 +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 qAR7tJau009818; Tue, 27 Nov 2012 00:55:25 -0700 From: Olivia Yin To: , Date: Tue, 27 Nov 2012 15:07:36 +0800 Message-ID: <1354000059-805-2-git-send-email-hong-hua.yin@freescale.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1354000059-805-1-git-send-email-hong-hua.yin@freescale.com> References: <1354000059-805-1-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 7 or 8 X-Received-From: 216.32.180.185 Cc: Olivia Yin Subject: [Qemu-devel] [RFC PATCH v6 1/4] use image_file_reset to reload 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 | 39 +++++++++++++++++++++++++++++++++++++++ hw/loader.h | 6 ++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index ba01ca6..e45f56a 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -86,6 +86,39 @@ int load_image(const char *filename, uint8_t *addr) return size; } +static void image_file_reset(void *opaque) +{ + ImageFile *image = opaque; + GError *err = NULL; + gboolean res; + gchar *content; + gsize size; + + if(image->dir) { + const char *basename; + char fw_file_name[56]; + + basename = strrchr(image->name, '/'); + if (basename) { + basename++; + } else { + basename = image->name; + } + snprintf(fw_file_name, sizeof(fw_file_name), "%s/%s", image->dir, + basename); + image->name = g_strdup(fw_file_name); + } + + res = g_file_get_contents(image->name, &content, &size, &err); + if (res == FALSE) { + error_report("failed to read image file: %s\n", image->name); + g_error_free(err); + } else { + cpu_physical_memory_write(image->addr, (uint8_t *)content, size); + g_free(content); + } +} + /* read()-like version */ ssize_t read_targphys(const char *name, int fd, hwaddr dst_addr, size_t nbytes) @@ -113,6 +146,12 @@ int load_image_targphys(const char *filename, } 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; } diff --git a/hw/loader.h b/hw/loader.h index 26480ad..9e76ebd 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -1,6 +1,12 @@ #ifndef LOADER_H #define LOADER_H +typedef struct ImageFile ImageFile; +struct ImageFile { + char *name; + hwaddr addr; +}; + /* loader.c */ int get_image_size(const char *filename); int load_image(const char *filename, uint8_t *addr); /* deprecated */