[kvm-devel] [PATCH 3 of 7] Create new load_uimage() gunzip support to uboot loader in Qemu
# HG changeset patch
# User Jerone Young [EMAIL PROTECTED]
# Date 1205937719 18000
# Branch merge
# Node ID 6bc8a342745dd8fefbe229cc4626144b19786117
# Parent 5371763b15da496413c4e818fb87a92c5e66eb56
Create new load_uimage() gunzip support to uboot loader in Qemu
This patch adds the ability for the load address to be caputred when loading a
uImage or cuImage. It also adds a better return code as the size can be an
usigned long. This is done by creating a new function prototype and calling it
load_uimage. To keep compatibility with code already using the old load_uboot()
a wrapper function has been created so current callers will not break.
Also added is gunzip support to allow for loading of uimages with a compressed
kenrel images.
Signed-off-by: Jerone Young [EMAIL PROTECTED]
diff --git a/qemu/loader.c b/qemu/loader.c
--- a/qemu/loader.c
+++ b/qemu/loader.c
@@ -26,6 +26,8 @@
#include sysemu.h
#include uboot_image.h
+#include zlib.h
+
/* return the size or -1 if error */
int get_image_size(const char *filename)
{
@@ -263,14 +265,106 @@ static void bswap_uboot_header(uboot_ima
}
/* Load a U-Boot image. */
-int load_uboot(const char *filename, target_ulong *ep, int *is_linux)
-{
-
+
+/* gunzip functionality is derived from gunzip function
+ * in uboot source code
+ */
+
+#defineZALLOC_ALIGNMENT16
+
+static void *zalloc(void *x, unsigned items, unsigned size)
+{
+ void *p;
+
+ size *= items;
+ size = (size + ZALLOC_ALIGNMENT - 1) ~(ZALLOC_ALIGNMENT - 1);
+
+ p = malloc (size);
+
+ return (p);
+}
+
+static void zfree(void *x, void *addr, unsigned nb)
+{
+ free (addr);
+}
+
+
+#define HEAD_CRC 2
+#define EXTRA_FIELD4
+#define ORIG_NAME 8
+#define COMMENT0x10
+#define RESERVED 0xe0
+
+#define DEFLATED 8
+
+static int gunzip(void *dst, int dstlen, unsigned char *src,
+ unsigned long *lenp)
+{
+ z_stream s;
+ int r, i, flags;
+
+ /* skip header */
+ i = 10;
+ flags = src[3];
+ if (src[2] != DEFLATED || (flags RESERVED) != 0) {
+ puts (Error: Bad gzipped data\n);
+ return -1;
+ }
+ if ((flags EXTRA_FIELD) != 0)
+ i = 12 + src[10] + (src[11] 8);
+ if ((flags ORIG_NAME) != 0)
+ while (src[i++] != 0)
+ ;
+ if ((flags COMMENT) != 0)
+ while (src[i++] != 0)
+ ;
+ if ((flags HEAD_CRC) != 0)
+ i += 2;
+ if (i = *lenp) {
+ puts (Error: gunzip out of data in header\n);
+ return -1;
+ }
+
+ s.zalloc = zalloc;
+ s.zfree = zfree;
+
+ r = inflateInit2(s, -MAX_WBITS);
+ if (r != Z_OK) {
+ printf (Error: inflateInit2() returned %d\n, r);
+ return (-1);
+ }
+ s.next_in = src + i;
+ s.avail_in = *lenp - i;
+ s.next_out = dst;
+ s.avail_out = dstlen;
+ r = inflate(s, Z_FINISH);
+ if (r != Z_OK r != Z_STREAM_END) {
+ printf (Error: inflate() returned %d\n, r);
+ return -1;
+ }
+ *lenp = s.next_out - (unsigned char *) dst;
+ inflateEnd(s);
+
+ return 0;
+}
+
+
+#define MAX_KERNEL_SIZE 820 //8MB
+/* This functions can load uImage cuImage files */
+int load_uimage(const char *filename, target_ulong *ep,
+target_ulong *load_address,
+target_ulong *loaded_image_size,
+int *is_linux)
+{
int fd;
int size;
+int ret;
uboot_image_header_t h;
uboot_image_header_t *hdr = h;
uint8_t *data = NULL;
+uint8_t *uncompressed_data = NULL;
+unsigned long tmp_loaded_image_size;
fd = open(filename, O_RDONLY | O_BINARY);
if (fd 0)
@@ -291,13 +385,14 @@ int load_uboot(const char *filename, tar
goto fail;
}
-/* TODO: Implement compressed images. */
-if (hdr-ih_comp != IH_COMP_NONE) {
-fprintf(stderr, Unable to load compressed u-boot images\n);
+/* TODO bzip2 support */
+if (hdr-ih_comp == IH_COMP_BZIP2) {
+fprintf(stderr, Unable to load bzip2 compressed u-boot images\n);
goto fail;
}
/* TODO: Check CPU type. */
+
if (is_linux) {
if (hdr-ih_type == IH_TYPE_KERNEL hdr-ih_os == IH_OS_LINUX)
*is_linux = 1;
@@ -306,6 +401,7 @@ int load_uboot(const char *filename, tar
}
*ep = hdr-ih_ep;
+
data = qemu_malloc(hdr-ih_size);
if (!data)
goto fail;
@@ -315,9 +411,35 @@ int load_uboot(const char *filename, tar
goto fail;
}
-cpu_physical_memory_write_rom(hdr-ih_load, data, hdr-ih_size);
-
-return hdr-ih_size;
+tmp_loaded_image_size = hdr-ih_size;
+
+if (hdr-ih_comp == IH_COMP_GZIP) {
+uncompressed_data = qemu_malloc(MAX_KERNEL_SIZE);
+ret = gunzip(uncompressed_data, MAX_KERNEL_SIZE,
[kvm-devel] [PATCH 3 of 7] Create new load_uimage() gunzip support to uboot loader in Qemu
# HG changeset patch
# User Jerone Young [EMAIL PROTECTED]
# Date 1205953006 18000
# Branch merge
# Node ID 05d6146c77066b2bc0dd8349ee39636bc303628d
# Parent be1aa50ab7de0a9e0441e46769e2a40a582fc3c0
Create new load_uimage() gunzip support to uboot loader in Qemu
This patch adds the ability for the load address to be caputred when loading a
uImage or cuImage. It also adds a better return code as the size can be an
usigned long. This is done by creating a new function prototype and calling it
load_uimage. To keep compatibility with code already using the old load_uboot()
a wrapper function has been created so current callers will not break.
Also added is gunzip support to allow for loading of uimages with a compressed
kenrel images.
Signed-off-by: Jerone Young [EMAIL PROTECTED]
diff --git a/qemu/loader.c b/qemu/loader.c
--- a/qemu/loader.c
+++ b/qemu/loader.c
@@ -26,6 +26,8 @@
#include sysemu.h
#include uboot_image.h
+#include zlib.h
+
/* return the size or -1 if error */
int get_image_size(const char *filename)
{
@@ -263,14 +265,106 @@ static void bswap_uboot_header(uboot_ima
}
/* Load a U-Boot image. */
-int load_uboot(const char *filename, target_ulong *ep, int *is_linux)
-{
-
+
+/* gunzip functionality is derived from gunzip function
+ * in uboot source code
+ */
+
+#defineZALLOC_ALIGNMENT16
+
+static void *zalloc(void *x, unsigned items, unsigned size)
+{
+ void *p;
+
+ size *= items;
+ size = (size + ZALLOC_ALIGNMENT - 1) ~(ZALLOC_ALIGNMENT - 1);
+
+ p = malloc (size);
+
+ return (p);
+}
+
+static void zfree(void *x, void *addr, unsigned nb)
+{
+ free (addr);
+}
+
+
+#define HEAD_CRC 2
+#define EXTRA_FIELD4
+#define ORIG_NAME 8
+#define COMMENT0x10
+#define RESERVED 0xe0
+
+#define DEFLATED 8
+
+static int gunzip(void *dst, int dstlen, unsigned char *src,
+ unsigned long *lenp)
+{
+ z_stream s;
+ int r, i, flags;
+
+ /* skip header */
+ i = 10;
+ flags = src[3];
+ if (src[2] != DEFLATED || (flags RESERVED) != 0) {
+ puts (Error: Bad gzipped data\n);
+ return -1;
+ }
+ if ((flags EXTRA_FIELD) != 0)
+ i = 12 + src[10] + (src[11] 8);
+ if ((flags ORIG_NAME) != 0)
+ while (src[i++] != 0)
+ ;
+ if ((flags COMMENT) != 0)
+ while (src[i++] != 0)
+ ;
+ if ((flags HEAD_CRC) != 0)
+ i += 2;
+ if (i = *lenp) {
+ puts (Error: gunzip out of data in header\n);
+ return -1;
+ }
+
+ s.zalloc = zalloc;
+ s.zfree = (free_func)zfree;
+
+ r = inflateInit2(s, -MAX_WBITS);
+ if (r != Z_OK) {
+ printf (Error: inflateInit2() returned %d\n, r);
+ return (-1);
+ }
+ s.next_in = src + i;
+ s.avail_in = *lenp - i;
+ s.next_out = dst;
+ s.avail_out = dstlen;
+ r = inflate(s, Z_FINISH);
+ if (r != Z_OK r != Z_STREAM_END) {
+ printf (Error: inflate() returned %d\n, r);
+ return -1;
+ }
+ *lenp = s.next_out - (unsigned char *) dst;
+ inflateEnd(s);
+
+ return 0;
+}
+
+
+#define MAX_KERNEL_SIZE 820 //8MB
+/* This functions can load uImage cuImage files */
+int load_uimage(const char *filename, target_ulong *ep,
+target_ulong *load_address,
+target_ulong *loaded_image_size,
+int *is_linux)
+{
int fd;
int size;
+int ret;
uboot_image_header_t h;
uboot_image_header_t *hdr = h;
uint8_t *data = NULL;
+uint8_t *uncompressed_data = NULL;
+unsigned long tmp_loaded_image_size;
fd = open(filename, O_RDONLY | O_BINARY);
if (fd 0)
@@ -291,13 +385,14 @@ int load_uboot(const char *filename, tar
goto fail;
}
-/* TODO: Implement compressed images. */
-if (hdr-ih_comp != IH_COMP_NONE) {
-fprintf(stderr, Unable to load compressed u-boot images\n);
+/* TODO bzip2 support */
+if (hdr-ih_comp == IH_COMP_BZIP2) {
+fprintf(stderr, Unable to load bzip2 compressed u-boot images\n);
goto fail;
}
/* TODO: Check CPU type. */
+
if (is_linux) {
if (hdr-ih_type == IH_TYPE_KERNEL hdr-ih_os == IH_OS_LINUX)
*is_linux = 1;
@@ -306,6 +401,7 @@ int load_uboot(const char *filename, tar
}
*ep = hdr-ih_ep;
+
data = qemu_malloc(hdr-ih_size);
if (!data)
goto fail;
@@ -315,9 +411,35 @@ int load_uboot(const char *filename, tar
goto fail;
}
-cpu_physical_memory_write_rom(hdr-ih_load, data, hdr-ih_size);
-
-return hdr-ih_size;
+tmp_loaded_image_size = hdr-ih_size;
+
+if (hdr-ih_comp == IH_COMP_GZIP) {
+uncompressed_data = qemu_malloc(MAX_KERNEL_SIZE);
+ret = gunzip(uncompressed_data,
Re: [kvm-devel] [PATCH 3 of 7] Create new load_uimage() gunzip support to uboot loader in Qemu
-cpu_physical_memory_write_rom(hdr-ih_load, data, hdr-ih_size);
-
-return hdr-ih_size;
+tmp_loaded_image_size = hdr-ih_size;
+
+if (hdr-ih_comp == IH_COMP_GZIP) {
+uncompressed_data = qemu_malloc(MAX_KERNEL_SIZE);
+ret = gunzip(uncompressed_data, MAX_KERNEL_SIZE,
+(unsigned char *) data,
+tmp_loaded_image_size);
+
+if (ret 0) {
+fprintf(stderr, Unable to decompress gziped image!\n);
+goto fail;
+}
+
+qemu_free(data);
+cpu_physical_memory_write_rom(hdr-ih_load, uncompressed_data,
+tmp_loaded_image_size);
+}
+else {
You've still got braces issues.
Regards,
Anthony Liguori
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
[kvm-devel] [PATCH 3 of 7] Create new load_uimage() gunzip support to uboot loader in Qemu
# HG changeset patch
# User Jerone Young [EMAIL PROTECTED]
# Date 1205956788 18000
# Branch merge
# Node ID e106ad4ec36334a0e2158a1396b4cbfbfeeb552e
# Parent cd9ca907432cd14522809f098cc64d5a2b88705b
Create new load_uimage() gunzip support to uboot loader in Qemu
This patch adds the ability for the load address to be caputred when loading a
uImage or cuImage. It also adds a better return code as the size can be an
usigned long. This is done by creating a new function prototype and calling it
load_uimage. To keep compatibility with code already using the old load_uboot()
a wrapper function has been created so current callers will not break.
Also added is gunzip support to allow for loading of uimages with a compressed
kenrel images.
Signed-off-by: Jerone Young [EMAIL PROTECTED]
diff --git a/qemu/loader.c b/qemu/loader.c
--- a/qemu/loader.c
+++ b/qemu/loader.c
@@ -26,6 +26,8 @@
#include sysemu.h
#include uboot_image.h
+#include zlib.h
+
/* return the size or -1 if error */
int get_image_size(const char *filename)
{
@@ -263,14 +265,106 @@ static void bswap_uboot_header(uboot_ima
}
/* Load a U-Boot image. */
-int load_uboot(const char *filename, target_ulong *ep, int *is_linux)
-{
-
+
+/* gunzip functionality is derived from gunzip function
+ * in uboot source code
+ */
+
+#defineZALLOC_ALIGNMENT16
+
+static void *zalloc(void *x, unsigned items, unsigned size)
+{
+ void *p;
+
+ size *= items;
+ size = (size + ZALLOC_ALIGNMENT - 1) ~(ZALLOC_ALIGNMENT - 1);
+
+ p = malloc (size);
+
+ return (p);
+}
+
+static void zfree(void *x, void *addr, unsigned nb)
+{
+ free (addr);
+}
+
+
+#define HEAD_CRC 2
+#define EXTRA_FIELD4
+#define ORIG_NAME 8
+#define COMMENT0x10
+#define RESERVED 0xe0
+
+#define DEFLATED 8
+
+static int gunzip(void *dst, int dstlen, unsigned char *src,
+ unsigned long *lenp)
+{
+ z_stream s;
+ int r, i, flags;
+
+ /* skip header */
+ i = 10;
+ flags = src[3];
+ if (src[2] != DEFLATED || (flags RESERVED) != 0) {
+ puts (Error: Bad gzipped data\n);
+ return -1;
+ }
+ if ((flags EXTRA_FIELD) != 0)
+ i = 12 + src[10] + (src[11] 8);
+ if ((flags ORIG_NAME) != 0)
+ while (src[i++] != 0)
+ ;
+ if ((flags COMMENT) != 0)
+ while (src[i++] != 0)
+ ;
+ if ((flags HEAD_CRC) != 0)
+ i += 2;
+ if (i = *lenp) {
+ puts (Error: gunzip out of data in header\n);
+ return -1;
+ }
+
+ s.zalloc = zalloc;
+ s.zfree = (free_func)zfree;
+
+ r = inflateInit2(s, -MAX_WBITS);
+ if (r != Z_OK) {
+ printf (Error: inflateInit2() returned %d\n, r);
+ return (-1);
+ }
+ s.next_in = src + i;
+ s.avail_in = *lenp - i;
+ s.next_out = dst;
+ s.avail_out = dstlen;
+ r = inflate(s, Z_FINISH);
+ if (r != Z_OK r != Z_STREAM_END) {
+ printf (Error: inflate() returned %d\n, r);
+ return -1;
+ }
+ *lenp = s.next_out - (unsigned char *) dst;
+ inflateEnd(s);
+
+ return 0;
+}
+
+
+#define MAX_KERNEL_SIZE 820 //8MB
+/* This functions can load uImage cuImage files */
+int load_uimage(const char *filename, target_ulong *ep,
+target_ulong *load_address,
+target_ulong *loaded_image_size,
+int *is_linux)
+{
int fd;
int size;
+int ret;
uboot_image_header_t h;
uboot_image_header_t *hdr = h;
uint8_t *data = NULL;
+uint8_t *uncompressed_data = NULL;
+unsigned long tmp_loaded_image_size;
fd = open(filename, O_RDONLY | O_BINARY);
if (fd 0)
@@ -291,13 +385,14 @@ int load_uboot(const char *filename, tar
goto fail;
}
-/* TODO: Implement compressed images. */
-if (hdr-ih_comp != IH_COMP_NONE) {
-fprintf(stderr, Unable to load compressed u-boot images\n);
+/* TODO bzip2 support */
+if (hdr-ih_comp == IH_COMP_BZIP2) {
+fprintf(stderr, Unable to load bzip2 compressed u-boot images\n);
goto fail;
}
/* TODO: Check CPU type. */
+
if (is_linux) {
if (hdr-ih_type == IH_TYPE_KERNEL hdr-ih_os == IH_OS_LINUX)
*is_linux = 1;
@@ -306,6 +401,7 @@ int load_uboot(const char *filename, tar
}
*ep = hdr-ih_ep;
+
data = qemu_malloc(hdr-ih_size);
if (!data)
goto fail;
@@ -315,9 +411,34 @@ int load_uboot(const char *filename, tar
goto fail;
}
-cpu_physical_memory_write_rom(hdr-ih_load, data, hdr-ih_size);
-
-return hdr-ih_size;
+tmp_loaded_image_size = hdr-ih_size;
+
+if (hdr-ih_comp == IH_COMP_GZIP) {
+uncompressed_data = qemu_malloc(MAX_KERNEL_SIZE);
+ret = gunzip(uncompressed_data,
[kvm-devel] [PATCH 3 of 7] Create new load_uimage() gunzip support to uboot loader in Qemu
# HG changeset patch
# User Jerone Young [EMAIL PROTECTED]
# Date 1205870472 18000
# Branch merge
# Node ID 25515e6983ba1e070cbdcb7be1527426a097048b
# Parent aa10b5ca2f11cd571ae8a06c1e92425b7f7407ca
Create new load_uimage() gunzip support to uboot loader in Qemu
This patch adds the ability for the load address to be caputred when loading a
uImage or cuImage. It also adds a better return code as the size can be an
usigned long. This is done by creating a new function prototype and calling it
load_uimage. To keep compatibility with code already using the old load_uboot a
wrapper function has been created so current callers will not break them.
Also added is gunzip support to allow for loading of uimages with a compressed
kenrel images.
Signed-off-by: Jerone Young [EMAIL PROTECTED]
diff --git a/qemu/loader.c b/qemu/loader.c
--- a/qemu/loader.c
+++ b/qemu/loader.c
@@ -26,6 +26,8 @@
#include sysemu.h
#include uboot_image.h
+#include zlib.h
+
/* return the size or -1 if error */
int get_image_size(const char *filename)
{
@@ -263,14 +265,106 @@ static void bswap_uboot_header(uboot_ima
}
/* Load a U-Boot image. */
-int load_uboot(const char *filename, target_ulong *ep, int *is_linux)
-{
-
+
+/* gunzip functionality is derived from gunzip function
+ * in uboot source code
+ */
+
+#defineZALLOC_ALIGNMENT16
+
+static void *zalloc(void *x, unsigned items, unsigned size)
+{
+ void *p;
+
+ size *= items;
+ size = (size + ZALLOC_ALIGNMENT - 1) ~(ZALLOC_ALIGNMENT - 1);
+
+ p = malloc (size);
+
+ return (p);
+}
+
+static void zfree(void *x, void *addr, unsigned nb)
+{
+ free (addr);
+}
+
+
+#define HEAD_CRC 2
+#define EXTRA_FIELD4
+#define ORIG_NAME 8
+#define COMMENT0x10
+#define RESERVED 0xe0
+
+#define DEFLATED 8
+
+static int gunzip(void *dst, int dstlen, unsigned char *src,
+ unsigned long *lenp)
+{
+ z_stream s;
+ int r, i, flags;
+
+ /* skip header */
+ i = 10;
+ flags = src[3];
+ if (src[2] != DEFLATED || (flags RESERVED) != 0) {
+ puts (Error: Bad gzipped data\n);
+ return -1;
+ }
+ if ((flags EXTRA_FIELD) != 0)
+ i = 12 + src[10] + (src[11] 8);
+ if ((flags ORIG_NAME) != 0)
+ while (src[i++] != 0)
+ ;
+ if ((flags COMMENT) != 0)
+ while (src[i++] != 0)
+ ;
+ if ((flags HEAD_CRC) != 0)
+ i += 2;
+ if (i = *lenp) {
+ puts (Error: gunzip out of data in header\n);
+ return -1;
+ }
+
+ s.zalloc = zalloc;
+ s.zfree = zfree;
+
+ r = inflateInit2(s, -MAX_WBITS);
+ if (r != Z_OK) {
+ printf (Error: inflateInit2() returned %d\n, r);
+ return (-1);
+ }
+ s.next_in = src + i;
+ s.avail_in = *lenp - i;
+ s.next_out = dst;
+ s.avail_out = dstlen;
+ r = inflate(s, Z_FINISH);
+ if (r != Z_OK r != Z_STREAM_END) {
+ printf (Error: inflate() returned %d\n, r);
+ return -1;
+ }
+ *lenp = s.next_out - (unsigned char *) dst;
+ inflateEnd(s);
+
+ return 0;
+}
+
+
+#define MAX_KERNEL_SIZE 8*1024*1024 //8MB
+/* This functions can load uImage cuImage files */
+int load_uimage(const char *filename, target_ulong *ep,
+ target_ulong *load_address,
+ target_ulong *loaded_image_size,
+ int *is_linux)
+{
int fd;
int size;
+int ret;
uboot_image_header_t h;
uboot_image_header_t *hdr = h;
uint8_t *data = NULL;
+uint8_t *uncompressed_data = NULL;
+unsigned long tmp_loaded_image_size;
fd = open(filename, O_RDONLY | O_BINARY);
if (fd 0)
@@ -291,13 +385,14 @@ int load_uboot(const char *filename, tar
goto fail;
}
-/* TODO: Implement compressed images. */
-if (hdr-ih_comp != IH_COMP_NONE) {
-fprintf(stderr, Unable to load compressed u-boot images\n);
+/* TODO bzip2 support */
+if (hdr-ih_comp == IH_COMP_BZIP2) {
+fprintf(stderr, Unable to load bzip2 compressed u-boot images\n);
goto fail;
}
/* TODO: Check CPU type. */
+
if (is_linux) {
if (hdr-ih_type == IH_TYPE_KERNEL hdr-ih_os == IH_OS_LINUX)
*is_linux = 1;
@@ -306,6 +401,7 @@ int load_uboot(const char *filename, tar
}
*ep = hdr-ih_ep;
+
data = qemu_malloc(hdr-ih_size);
if (!data)
goto fail;
@@ -315,9 +411,36 @@ int load_uboot(const char *filename, tar
goto fail;
}
-cpu_physical_memory_write_rom(hdr-ih_load, data, hdr-ih_size);
-
-return hdr-ih_size;
+tmp_loaded_image_size = hdr-ih_size;
+
+if (hdr-ih_comp == IH_COMP_GZIP) {
+ uncompressed_data = qemu_malloc(MAX_KERNEL_SIZE);
+ ret =
