From patchwork Mon Oct 29 05:21:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivia Yin X-Patchwork-Id: 194835 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 4E6222C00A8 for ; Mon, 29 Oct 2012 17:34:15 +1100 (EST) Received: from localhost ([::1]:55628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSivN-0007vM-Ei for incoming@patchwork.ozlabs.org; Mon, 29 Oct 2012 02:34:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSivF-0007tM-UE for qemu-devel@nongnu.org; Mon, 29 Oct 2012 02:34:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSivF-0000u1-3k for qemu-devel@nongnu.org; Mon, 29 Oct 2012 02:34:05 -0400 Received: from tx2ehsobe005.messaging.microsoft.com ([65.55.88.15]:7577 helo=tx2outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSivC-0000p3-NO; Mon, 29 Oct 2012 02:34:02 -0400 Received: from mail208-tx2-R.bigfish.com (10.9.14.249) by TX2EHSOBE008.bigfish.com (10.9.40.28) with Microsoft SMTP Server id 14.1.225.23; Mon, 29 Oct 2012 06:03:56 +0000 Received: from mail208-tx2 (localhost [127.0.0.1]) by mail208-tx2-R.bigfish.com (Postfix) with ESMTP id 5AF48B800D3; Mon, 29 Oct 2012 06:03:56 +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 mail208-tx2 (localhost.localdomain [127.0.0.1]) by mail208-tx2 (MessageSwitch) id 1351490634745376_22225; Mon, 29 Oct 2012 06:03:54 +0000 (UTC) Received: from TX2EHSMHS033.bigfish.com (unknown [10.9.14.247]) by mail208-tx2.bigfish.com (Postfix) with ESMTP id A7A3CAC0048; Mon, 29 Oct 2012 06:03:54 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS033.bigfish.com (10.9.99.133) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 29 Oct 2012 06:03:54 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.318.3; Mon, 29 Oct 2012 06:03:53 +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 q9T63iuM008463; Sun, 28 Oct 2012 23:03:52 -0700 From: Olivia Yin To: , Date: Mon, 29 Oct 2012 13:21:32 +0800 Message-ID: <1351488096-22765-2-git-send-email-hong-hua.yin@freescale.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1351488096-22765-1-git-send-email-hong-hua.yin@freescale.com> References: <1351488096-22765-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 XP/2000 (RFC1323+, w+, tstamp-) X-Received-From: 65.55.88.15 Cc: Olivia Yin Subject: [Qemu-devel] [RFC PATCH v2 1/5] define image_file_reset and image_blob_reset 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 | 18 ++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index ba01ca6..cadf58f 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -86,6 +86,45 @@ int load_image(const char *filename, uint8_t *addr) return size; } +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_rw(image->addr, (uint8_t *)content, size, 1); + g_free(content); + } +} + +void image_blob_reset(void *opaque) +{ + ImageBlob *blob = opaque; + cpu_physical_memory_rw(blob->addr, blob->data, blob->size, 1); +} + /* read()-like version */ ssize_t read_targphys(const char *name, int fd, hwaddr dst_addr, size_t nbytes) diff --git a/hw/loader.h b/hw/loader.h index 26480ad..e8030e7 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -46,4 +46,22 @@ void do_info_roms(Monitor *mon); int rom_add_vga(const char *file); int rom_add_option(const char *file, int32_t bootindex); +typedef struct ImageFile ImageFile; +struct ImageFile { + char *name; + char *dir; + hwaddr addr; +}; + +typedef struct ImageBlob ImageBlob; +struct ImageBlob { + char *name; + hwaddr addr; + ssize_t size; + uint8_t *data; +}; + +void image_blob_reset(void *opaque); +void image_file_reset(void *opaque); + #endif