From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePAU-0002af-TN for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZePAT-0001GT-Ni for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14192) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePAT-0001GL-IW for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:41 -0400 From: Paolo Bonzini Date: Tue, 22 Sep 2015 17:05:59 +0200 Message-Id: <1442934371-12567-37-git-send-email-pbonzini@redhat.com> In-Reply-To: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> References: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 36/48] moxie: Remove ELF_MACHINE from cpu.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , Anthony Green , Peter Crosthwaite From: Peter Crosthwaite The bootloader can just pass EM_MOXIE directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Anthony Green Reviewed-by: Richard Henderson Acked-By: Riku Voipio Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- hw/moxie/moxiesim.c | 3 +-- target-moxie/cpu.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 4e98c20..ada3d58 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -53,8 +53,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) ram_addr_t initrd_offset; kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL, - &entry, &kernel_low, &kernel_high, 1, - ELF_MACHINE, 0); + &entry, &kernel_low, &kernel_high, 1, EM_MOXIE, 0); if (kernel_size <= 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h index 7d47e0d..2bac15b 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -26,8 +26,6 @@ #define CPUArchState struct CPUMoxieState -#define ELF_MACHINE EM_MOXIE - #define MOXIE_EX_DIV0 0 #define MOXIE_EX_BAD 1 #define MOXIE_EX_IRQ 2 -- 2.5.0