From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Olivia Yin Date: Tue, 27 Nov 2012 15:07:36 +0800 Message-ID: <1354000059-805-2-git-send-email-hong-hua.yin@freescale.com> 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 Content-Type: text/plain Subject: [Qemu-devel] [RFC PATCH v6 1/4] use image_file_reset to reload initrd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Olivia Yin 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 */ -- 1.7.1