diff options
| -rw-r--r-- | hw/i386/multiboot.c | 2 | ||||
| -rw-r--r-- | target-i386/cpu.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 1adbe9e25f..6774a1932e 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -195,7 +195,7 @@ int load_multiboot(FWCfgState *fw_cfg, } kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry, - &elf_low, &elf_high, 0, ELF_MACHINE, 0); + &elf_low, &elf_high, 0, I386_ELF_MACHINE, 0); if (kernel_size < 0) { fprintf(stderr, "Error while loading elf kernel\n"); exit(1); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 527eb99632..034fab6f39 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -37,10 +37,10 @@ #define TARGET_HAS_PRECISE_SMC #ifdef TARGET_X86_64 -#define ELF_MACHINE EM_X86_64 +#define I386_ELF_MACHINE EM_X86_64 #define ELF_MACHINE_UNAME "x86_64" #else -#define ELF_MACHINE EM_386 +#define I386_ELF_MACHINE EM_386 #define ELF_MACHINE_UNAME "i686" #endif |