From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCG4J-0004j3-PT for qemu-devel@nongnu.org; Tue, 29 Jul 2014 18:40:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCG49-0007Us-Dv for qemu-devel@nongnu.org; Tue, 29 Jul 2014 18:40:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCG49-0007Ul-6h for qemu-devel@nongnu.org; Tue, 29 Jul 2014 18:40:17 -0400 From: "Richard W.M. Jones" Date: Tue, 29 Jul 2014 23:40:09 +0100 Message-Id: <1406673609-1685-1-git-send-email-rjones@redhat.com> Subject: [Qemu-devel] [PATCH] aarch64: Allow -kernel option to take a gzip-compressed kernel. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Signed-off-by: Richard W.M. Jones --- hw/arm/boot.c | 9 +++++++++ hw/core/loader.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/loader.h | 1 + 3 files changed, 58 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 3d1f4a2..1086a05 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -510,6 +510,15 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) kernel_size = load_uimage(info->kernel_filename, &entry, NULL, &is_linux); } + /* On aarch64, it's the bootloader's job to uncompress the kernel. */ + if (cpu->env.aarch64 && kernel_size < 0) { + entry = info->loader_start + kernel_load_offset; + kernel_size = load_image_gzipped(info->kernel_filename, entry, + info->ram_size - kernel_load_offset); + if (kernel_size >= 0) { + is_linux = 1; + } + } if (kernel_size < 0) { entry = info->loader_start + kernel_load_offset; kernel_size = load_image_targphys(info->kernel_filename, entry, diff --git a/hw/core/loader.c b/hw/core/loader.c index 2bf6b8f..38f10aa 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -577,6 +577,54 @@ int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz) return load_uboot_image(filename, NULL, &addr, NULL, IH_TYPE_RAMDISK); } +/* Load a gzip-compressed kernel (currently used by aarch64). */ +int load_image_gzipped(const char *filename, hwaddr addr, uint64_t max_sz) +{ + uint8_t *compressed_data = NULL; + uint8_t *data = NULL; + gsize len; + size_t max_bytes; + ssize_t bytes; + int ret = -1; + + if (!g_file_get_contents(filename, (char **) &compressed_data, &len, + NULL)) { + goto out; + } + + /* Is it a gzip-compressed file? */ + if (len < 2 || + compressed_data[0] != '\x1f' || + compressed_data[1] != '\x8b') { + goto out; + } + + max_bytes = UBOOT_MAX_GUNZIP_BYTES; + data = g_malloc(max_bytes); + bytes = gunzip(data, max_bytes, compressed_data, len); + if (bytes < 0) { + fprintf(stderr, "%s: unable to decompress gzipped kernel file\n", + filename); + goto out; + } + if (bytes > max_sz) { + fprintf(stderr, "%s: decompressed file is too large\n", filename); + goto out; + } + + rom_add_blob_fixed(filename, data, bytes, addr); + ret = bytes; + + out: + if (compressed_data) { + g_free(compressed_data); + } + if (data) { + g_free(data); + } + return ret; +} + /* * Functions for reboot-persistent memory regions. * - used for vga bios and option roms. diff --git a/include/hw/loader.h b/include/hw/loader.h index 796cbf9..00c9117 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -15,6 +15,7 @@ int get_image_size(const char *filename); int load_image(const char *filename, uint8_t *addr); /* deprecated */ int load_image_targphys(const char *filename, hwaddr, uint64_t max_sz); +int load_image_gzipped(const char *filename, hwaddr addr, uint64_t max_sz); #define ELF_LOAD_FAILED -1 #define ELF_LOAD_NOT_ELF -2 -- 2.0.1