diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-12-25 04:40:41 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-12-28 15:08:38 -0500 |
commit | 28afb45ff5151bd0e1c6d2796a12fac36b960b1b (patch) | |
tree | c175cd03862d5c98cb229f76fdfa9f5a59630fed /libre/qemu-user-static/allow_elf64.patch | |
parent | 55ce24617af467542ae1b07814617fbe2b360e33 (diff) | |
download | abslibre-28afb45ff5151bd0e1c6d2796a12fac36b960b1b.tar.gz abslibre-28afb45ff5151bd0e1c6d2796a12fac36b960b1b.tar.bz2 abslibre-28afb45ff5151bd0e1c6d2796a12fac36b960b1b.zip |
libre/{qemu-static => qemu-user-static}: upgpkg 2.11.0-3.parabola1
Diffstat (limited to 'libre/qemu-user-static/allow_elf64.patch')
-rw-r--r-- | libre/qemu-user-static/allow_elf64.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/libre/qemu-user-static/allow_elf64.patch b/libre/qemu-user-static/allow_elf64.patch new file mode 100644 index 000000000..07f27a038 --- /dev/null +++ b/libre/qemu-user-static/allow_elf64.patch @@ -0,0 +1,27 @@ +commit 3c72765ec760a51f0e879dc792be82c93141e318 +Author: Anatol Pomozov <anatol.pomozov@gmail.com> +Date: Tue Jun 6 20:07:03 2017 -0700 + + Remove restriction that prevents bootimg elf64 images + + It is possible to create a 64 bit elf image that has valid multiboot header. + qemu should be able to boot such images. + + Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> + +diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c +index 663f35a658..cf1b4f5fb3 100644 +--- a/hw/i386/multiboot.c ++++ b/hw/i386/multiboot.c +@@ -192,11 +192,6 @@ int load_multiboot(FWCfgState *fw_cfg, + int kernel_size; + fclose(f); + +- if (((struct elf64_hdr*)header)->e_machine == EM_X86_64) { +- fprintf(stderr, "Cannot load x86-64 image, give a 32bit one.\n"); +- exit(1); +- } +- + kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry, + &elf_low, &elf_high, 0, I386_ELF_MACHINE, + 0, 0); |