[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [RFC PATCH v5 1/4] use image_file_reset to reload initrd imag
From: |
Olivia Yin |
Subject: |
[Qemu-ppc] [RFC PATCH v5 1/4] use image_file_reset to reload initrd image |
Date: |
Wed, 21 Nov 2012 15:38:02 +0800 |
Signed-off-by: Olivia Yin <address@hidden>
---
hw/loader.c | 39 +++++++++++++++++++++++++++++++++++++++
hw/loader.h | 7 +++++++
2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/hw/loader.c b/hw/loader.c
index ba01ca6..a8a0a09 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..d021629 100644
--- a/hw/loader.h
+++ b/hw/loader.h
@@ -1,6 +1,13 @@
#ifndef LOADER_H
#define LOADER_H
+typedef struct ImageFile ImageFile;
+struct ImageFile {
+ char *name;
+ char *dir;
+ hwaddr addr;
+};
+
/* loader.c */
int get_image_size(const char *filename);
int load_image(const char *filename, uint8_t *addr); /* deprecated */
--
1.7.1
[Qemu-ppc] [RFC PATCH v5 2/4] use uimage_reset to reload uimage, Olivia Yin, 2012/11/21