From patchwork Sat May 5 23:35:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10382499 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A7EE660318 for ; Sat, 5 May 2018 23:52:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 995A528DD4 for ; Sat, 5 May 2018 23:52:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E02B28F79; Sat, 5 May 2018 23:52:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D438628DD4 for ; Sat, 5 May 2018 23:52:00 +0000 (UTC) Received: from localhost ([::1]:40340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6y8-00079r-6L for patchwork-qemu-devel@patchwork.kernel.org; Sat, 05 May 2018 19:52:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6k5-0004D6-0M for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fF6k1-0003oe-6g for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:29 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:39477) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fF6k1-0003oI-1J for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:25 -0400 Received: by mail-pg0-x242.google.com with SMTP id e1-v6so6431881pga.6 for ; Sat, 05 May 2018 16:37:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X5Czuf6eX+C7jbQh4er/CRRjA+HddOHaco2dXcG6wog=; b=MfixepKEZ0owFCVfrg2OODZD9H0ErOfzaWWfGmwDtiHch6wNUIYEpE2nbcWrUbnIf1 Ll2pim/IZkm8+Hw7EmhLLxiVPSV4QQqejyjUnDX39DY38m5ujwJ0+TlsLRj2MgWAig4/ jzPV2OLckvWn4L8YR3eu0MCRKiK0dCLd6kKflHt5BmGsO3EXiKoqBLwzryEasbhmY7R1 zXyuXU7bxsOTk0O3BoOOU8iu6ZFtr7m3GnkJ3ZVr3wKMVjZT2np1fU2J6txkF7Taw5Hw 6APBsbnxmUW3Yrm1zD9wok/0WKPjDlXNm9ZE/PuJ0QO5InQKddytdyDvgqKem5xzii4d V6GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X5Czuf6eX+C7jbQh4er/CRRjA+HddOHaco2dXcG6wog=; b=ucZ+RBMUfZkWfDFLlhhz1u/7P5OK6h9O70Rbfu0EG0Vm8+aVhahAbZsNmky/yqSNSF 6AxH0XwcMS6p0jMZzmHJGPvkLEXf5upAy0VrhkYqPF2vvu/NgH+TqJxHzqWTR5Z1b48X R4T3c4lQgDgRdQlYQfppD9fj9lZWLTC6kh411TeallDve58ZDDaoIfCWdWj/oMt+aqeO RQ4l3FBrlIrk0y3KQb62FoUxHLJvJFiCx2FGnp4iZye3Nu2NQsmKQUtRK5H51mEHfC1n ZpXkNU2OuQR3Z9bTSIY+79ux3eZ0St5YZuhQ1ZyVwEM9fjd9YdpVcrai66a6KnldMGYr zW7w== X-Gm-Message-State: ALQs6tDZ0YRr/Kn8MrxaoCGj1mxriLso0+cKRW72iihJPLfmqm8CLlci r72LEQ/r5IV1/RWmq/IrpHpgpX10DOI= X-Google-Smtp-Source: AB8JxZrm0PWkwE0kzIwF/bKPxxtP6cfc3n3ROY6z6BeE+wbC3Xx4MxHQg1LKDqRsMeauhr2+2szbeg== X-Received: by 2002:a17:902:264:: with SMTP id 91-v6mr32748709plc.341.1525563444148; Sat, 05 May 2018 16:37:24 -0700 (PDT) Received: from localhost.localdomain (122-58-167-38-fibre.bb.spark.co.nz. [122.58.167.38]) by smtp.gmail.com with ESMTPSA id x8sm47297094pfa.173.2018.05.05.16.37.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 May 2018 16:37:23 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Sun, 6 May 2018 11:35:15 +1200 Message-Id: <1525563325-62963-11-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1525563325-62963-1-git-send-email-mjc@sifive.com> References: <1525563325-62963-1-git-send-email-mjc@sifive.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PULL 10/20] RISC-V: Remove EM_RISCV ELF_MACHINE indirection X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: patches@groups.riscv.org, Michael Clark , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Pointless indirection. Other ports use EM_ constants directly. Cc: Sagar Karandikar Cc: Bastian Koppelmann Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/riscv/sifive_e.c | 2 +- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- target/riscv/cpu.h | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 22dc526713c2..6fa223818502 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -88,7 +88,7 @@ static uint64_t load_kernel(const char *kernel_filename) if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, - 0, ELF_MACHINE, 1, 0) < 0) { + 0, EM_RISCV, 1, 0) < 0) { error_report("qemu: could not load kernel '%s'", kernel_filename); exit(1); } diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 5bb495ab9a6c..84afed4c3b0e 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -74,7 +74,7 @@ static uint64_t load_kernel(const char *kernel_filename) if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, - 0, ELF_MACHINE, 1, 0) < 0) { + 0, EM_RISCV, 1, 0) < 0) { error_report("qemu: could not load kernel '%s'", kernel_filename); exit(1); } diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 44eab94e17ef..9e18c618bfbb 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -64,7 +64,7 @@ static uint64_t load_kernel(const char *kernel_filename) uint64_t kernel_entry, kernel_high; if (load_elf_ram_sym(kernel_filename, NULL, NULL, - &kernel_entry, NULL, &kernel_high, 0, ELF_MACHINE, 1, 0, + &kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0, NULL, true, htif_symbol_callback) < 0) { error_report("qemu: could not load kernel '%s'", kernel_filename); exit(1); diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 88b9ad509315..7ef9ba26debc 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -68,7 +68,7 @@ static uint64_t load_kernel(const char *kernel_filename) if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, - 0, ELF_MACHINE, 1, 0) < 0) { + 0, EM_RISCV, 1, 0) < 0) { error_report("qemu: could not load kernel '%s'", kernel_filename); exit(1); } diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 41e06ac0f91d..9871e6feb1de 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -34,7 +34,6 @@ #define TCG_GUEST_DEFAULT_MO 0 -#define ELF_MACHINE EM_RISCV #define CPUArchState struct CPURISCVState #include "qemu-common.h"