[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 2/5] use reset handlers to reload kernel and
From: |
Olivia Yin |
Subject: |
[Qemu-devel] [RFC PATCH v2 2/5] use reset handlers to reload kernel and initrd |
Date: |
Mon, 29 Oct 2012 13:21:33 +0800 |
Signed-off-by: Olivia Yin <address@hidden>
---
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.
--
1.7.1
Re: [Qemu-devel] [Qemu-ppc] [RFC PATCH v2 1/5] define image_file_reset and image_blob_reset, Alexander Graf, 2012/10/29
Re: [Qemu-devel] [Qemu-ppc] private handlers to reload images when virtual machine reset., Alexander Graf, 2012/10/29