diff options
| author | Jed Liu | 2018-05-05 01:48:55 -0400 |
|---|---|---|
| committer | Jed Liu | 2018-05-05 01:48:55 -0400 |
| commit | 62e264a9c22079941f8726a3b3789474e99d4455 (patch) | |
| tree | f6f64cda42506f4836478084d52beeda933b504b /allow_elf64.patch | |
| parent | af33bbf9f5d9fee9f78579f2f0929aa4ce190f3c (diff) | |
| download | aur-qemu-minimal.tar.gz | |
upgpkg: qemu-minimal 2.12.0
Diffstat (limited to 'allow_elf64.patch')
| -rw-r--r-- | allow_elf64.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/allow_elf64.patch b/allow_elf64.patch index 07f27a038b1b..0c5f6917c6ba 100644 --- a/allow_elf64.patch +++ b/allow_elf64.patch @@ -1,24 +1,22 @@ -commit 3c72765ec760a51f0e879dc792be82c93141e318 +commit cb61bc8a42da1a971079767e63df4503b6ab2efb Author: Anatol Pomozov <anatol.pomozov@gmail.com> -Date: Tue Jun 6 20:07:03 2017 -0700 +Date: Mon Jan 29 10:08:53 2018 -0800 - Remove restriction that prevents bootimg elf64 images + multiboot: Make elf64 loading functionality compatible with GRUB - 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> + GRUB is a reference multiboot implementation and supports loading elf64 + binaries. Make QEMU to work similar was as GRUB. diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c -index 663f35a658..cf1b4f5fb3 100644 +index 5bc0a2cddb..0907e42a39 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c -@@ -192,11 +192,6 @@ int load_multiboot(FWCfgState *fw_cfg, +@@ -193,11 +193,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"); +- error_report("Cannot load x86-64 image, give a 32bit one."); - exit(1); - } - |