From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFpfo-00006P-1A for qemu-devel@nongnu.org; Fri, 08 Aug 2014 15:18:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XFpfg-0000hG-OJ for qemu-devel@nongnu.org; Fri, 08 Aug 2014 15:17:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6431) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFpfg-0000h4-G6 for qemu-devel@nongnu.org; Fri, 08 Aug 2014 15:17:48 -0400 From: "Richard W.M. Jones" Date: Fri, 8 Aug 2014 20:17:39 +0100 Message-Id: <1407525459-9181-3-git-send-email-rjones@redhat.com> In-Reply-To: <1407525459-9181-1-git-send-email-rjones@redhat.com> References: <1407525459-9181-1-git-send-email-rjones@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v7 2/2] 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, peter.crosthwaite@xilinx.com, alex.bennee@linaro.org On aarch64 it is the bootloader's job to uncompress the kernel. UEFI and u-boot bootloaders do this automatically when the kernel is gzip-compressed. However the qemu -kernel option does not do this. The following command does not work: qemu-system-aarch64 [...] -kernel /boot/vmlinuz because it tries to execute the gzip-compressed data. This commit lets gzip-compressed kernels be uncompressed transparently. Currently this is only done when emulating aarch64. Signed-off-by: Richard W.M. Jones Reviewed-by: Alex Benn=C3=A9e --- hw/arm/boot.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 1241761..c71c4d5 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -448,6 +448,7 @@ static void do_cpu_reset(void *opaque) void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) { CPUState *cs =3D CPU(cpu); + int allow_compressed_kernels =3D 0; int kernel_size; int initrd_size; int is_linux =3D 0; @@ -469,6 +470,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_inf= o *info) primary_loader =3D bootloader_aarch64; kernel_load_offset =3D KERNEL64_LOAD_ADDR; elf_machine =3D EM_AARCH64; + allow_compressed_kernels =3D 1; } else { primary_loader =3D bootloader; kernel_load_offset =3D KERNEL_LOAD_ADDR; @@ -514,6 +516,13 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_in= fo *info) kernel_size =3D load_uimage(info->kernel_filename, &entry, NULL, &is_linux); } + /* On aarch64, it's the bootloader's job to uncompress the kernel. *= / + if (allow_compressed_kernels && kernel_size < 0) { + entry =3D info->loader_start + kernel_load_offset; + kernel_size =3D load_image_gzipped(info->kernel_filename, entry, + info->ram_size - kernel_load_of= fset); + is_linux =3D 1; + } if (kernel_size < 0) { entry =3D info->loader_start + kernel_load_offset; kernel_size =3D load_image_targphys(info->kernel_filename, entry= , --=20 2.0.4