From patchwork Sat Aug 15 23:28:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 507664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B253E14012C for ; Sun, 16 Aug 2015 09:36:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=g+YqpL4N; dkim-atps=neutral Received: from localhost ([::1]:51079 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQl01-0004PN-Tt for incoming@patchwork.ozlabs.org; Sat, 15 Aug 2015 19:36:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQkss-0006xo-DW for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQksq-0000gI-Va for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:06 -0400 Received: from mail-pd0-x22a.google.com ([2607:f8b0:400e:c02::22a]:33557) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksq-0000g4-KB for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:04 -0400 Received: by pdrh1 with SMTP id h1so42863784pdr.0 for ; Sat, 15 Aug 2015 16:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=VF1CZ3WH8e41qeU96sPKjeT6+IA64RcXgcx/FhFpSgM=; b=g+YqpL4NgSDhSd0BcDsIIjSfL/3O7k7EAUK740xVjkB2KuA8xDkpnigOJYLnIAcFzj VBTq5rjN6HioeaF7OIKnnBvmabZHz/CV4O6PZuhExqR4QCKve+0ZreGUTjB0D/fSTSWA JqMsPSwgU3y4hNKXFJKwwgST6AbkgucVPJNPDM5fQqfbxlBbOKHdP6lK620F+F7F03SZ 7ojR/6L5Nue9NS6yGRLI+incqZW5+/wCK2lh4ZjCRSs9LaLp/nMdqRfNgvMYQiLFM+la t0aq18a0A+N8wL3HC5okkzzdUeMstL65hulOtywpw2TLUlHHYhjFQkqSgsTOngd+mNIC LVjw== X-Received: by 10.70.50.165 with SMTP id d5mr54180367pdo.23.1439681344009; Sat, 15 Aug 2015 16:29:04 -0700 (PDT) Received: from pcrost-box.hsd1.ca.comcast.net (c-50-168-24-48.hsd1.ca.comcast.net. [50.168.24.48]) by smtp.gmail.com with ESMTPSA id q6sm9863304pdp.14.2015.08.15.16.29.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Aug 2015 16:29:03 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sat, 15 Aug 2015 16:28:25 -0700 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22a Cc: pbonzini@redhat.com, Peter Crosthwaite , riku.voipio@iki.fi, Mark Cave-Ayland , Peter Crosthwaite Subject: [Qemu-devel] [PATCH 15/19] sparc: Remove ELF_MACHINE from cpu.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Peter Crosthwaite The bootloaders can just pass EM_SPARC or EM_SPARCV9 directly, as they are architecture specific code (to one or the other). This removes another architecture specific definition from the global namespace. Cc: Mark Cave-Ayland Signed-off-by: Peter Crosthwaite --- hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 4 ++-- hw/sparc64/sun4u.c | 4 ++-- target-sparc/cpu.h | 6 ------ 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 7f5dcd6..2d7ec76 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -193,7 +193,7 @@ static void leon3_generic_hw_init(MachineState *machine) uint64_t entry; kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, NULL, NULL, - 1 /* big endian */, ELF_MACHINE, 0); + 1 /* big endian */, EM_SPARC, 0); if (kernel_size < 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 68ac4d8..6eb7ef8 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -300,7 +300,7 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename, bswap_needed = 0; #endif kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, - NULL, NULL, NULL, 1, ELF_MACHINE, 0); + NULL, NULL, NULL, 1, EM_SPARC, 0); if (kernel_size < 0) kernel_size = load_aout(kernel_filename, KERNEL_LOAD_ADDR, RAM_size - KERNEL_LOAD_ADDR, bswap_needed, @@ -744,7 +744,7 @@ static void prom_init(hwaddr addr, const char *bios_name) filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (filename) { ret = load_elf(filename, translate_prom_address, &addr, NULL, - NULL, NULL, 1, ELF_MACHINE, 0); + NULL, NULL, 1, EM_SPARC, 0); if (ret < 0 || ret > PROM_SIZE_MAX) { ret = load_image_targphys(filename, addr, PROM_SIZE_MAX); } diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 30cfa0e..d359cb8 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -208,7 +208,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, bswap_needed = 0; #endif kernel_size = load_elf(kernel_filename, NULL, NULL, kernel_entry, - kernel_addr, &kernel_top, 1, ELF_MACHINE, 0); + kernel_addr, &kernel_top, 1, EM_SPARCV9, 0); if (kernel_size < 0) { *kernel_addr = KERNEL_LOAD_ADDR; *kernel_entry = KERNEL_LOAD_ADDR; @@ -671,7 +671,7 @@ static void prom_init(hwaddr addr, const char *bios_name) filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (filename) { ret = load_elf(filename, translate_prom_address, &addr, - NULL, NULL, NULL, 1, ELF_MACHINE, 0); + NULL, NULL, NULL, 1, EM_SPARCV9, 0); if (ret < 0 || ret > PROM_SIZE_MAX) { ret = load_image_targphys(filename, addr, PROM_SIZE_MAX); } diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 0522b65..b5ff644 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -31,12 +31,6 @@ #include "fpu/softfloat.h" -#if !defined(TARGET_SPARC64) -#define ELF_MACHINE EM_SPARC -#else -#define ELF_MACHINE EM_SPARCV9 -#endif - /*#define EXCP_INTERRUPT 0x100*/ /* trap definitions */