From nobody Sat Oct 25 08:57:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 152036931051615.352577632739667; Tue, 6 Mar 2018 12:48:30 -0800 (PST) Received: from localhost ([::1]:58068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJVd-0007vs-NG for importer@patchew.org; Tue, 06 Mar 2018 15:48:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJTL-0006cv-KC for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:46:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etJTK-0003bu-Li for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:46:07 -0500 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:38731) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etJTK-0003bg-G3 for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:46:06 -0500 Received: by mail-pl0-x243.google.com with SMTP id m22-v6so9033720pls.5 for ; Tue, 06 Mar 2018 12:46:06 -0800 (PST) Received: from localhost.localdomain (125-237-39-90-fibre.bb.spark.co.nz. [125.237.39.90]) by smtp.gmail.com with ESMTPSA id y6sm39123791pfg.71.2018.03.06.12.46.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 12:46:04 -0800 (PST) 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; bh=/C07RqM/BlMPTdP/pmj+lTUgugpn/+HiMXTwWgihciw=; b=UUK9hOc8EywmYTMhokU3ZDcZt7BrG53aZlIXsoNB/OechzU0513jfvt0GNV4NdPGbk SS8g6hEXnOaS6/Jp2We6BmLgrxRCaY5qpCliRDmNn7ySshwUMAZe+Hd4h0u2ut8g5/d5 wEmekOyM2jnjDDZp/PV7wErZJB8HcaO+4mW4QLu1MUamM72xx68A4qdHh/zDt2X2PZb0 5FBpxQNyyb2vkf5yVR/qMNX4YsStwZ1bRGBzIgmBuwwSdJRTeD7KxQ28QJnBr9VmP3dT QfXr+2w7Fv5v3/mfZ5HqDwiB9S/l+2KgSEH+AkJspIAi2MhJYEjLbf3tEjJBa2DwGX56 EfOw== 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; bh=/C07RqM/BlMPTdP/pmj+lTUgugpn/+HiMXTwWgihciw=; b=bTJpob0WsWVPtbPQsV7ko0TIeSi3JZlWDOh7EZFBHkuuqE7PZitTF8FMSs0eMWGazD CQh610W4XvZYncMmuU3q9u0aKploM/Ol+aI6Io3mxKvyvZnNNTYx2j5lFuObNgHAKoPu wnW6mW9ozANq8wKdrlD4bBmi4IsKBnkhKByxJV+QBbug3skH4cb2AoerqtBERR/68Qb+ TrhvAsCYQMdw7g6FZ2ScAAyAcfAxXGf+43Df1//0D3mek7kzc2i62s7dp9+orBKJzBH/ rKB13Wqc3ycD/kzQxq/YO+SIyXgLgeK0Us7nktlvky1x2WjzSXXc1Git3SyWhjJgG5st OLmQ== X-Gm-Message-State: APf1xPDxFYUgursSXV3Z8QbLxuATXSb3p/2fkIH00CGfhmytcoG04BlR 6FKq5bFn/VgewSi+Z8nurPq0OyJ/RCY= X-Google-Smtp-Source: AG47ELucXLrkhzA/wCxO3VmOOo1VJvlzMBECZ8KuyOXmkV9P8snVpNEsUu7GA/OO5tAayF4qCofOvA== X-Received: by 2002:a17:902:5322:: with SMTP id b31-v6mr17561069pli.61.1520369165493; Tue, 06 Mar 2018 12:46:05 -0800 (PST) From: Michael Clark To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 09:43:51 +1300 Message-Id: <1520369037-37977-17-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1520369037-37977-1-git-send-email-mjc@sifive.com> References: <1520369037-37977-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::243 Subject: [Qemu-devel] [PATCH v1 16/22] RISC-V: Remove EM_RISCV ELF_MACHINE indirection from 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: Bastian Koppelmann , Michael Clark , Palmer Dabbelt , Sagar Karandikar , RISC-V Patches load_elf Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pointless indirection. Other ports use EM_ constants directly. Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt --- 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 4872b68..39e4cb4 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) =20 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 57b4f4f..0e633a0 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) =20 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 c7d937b..70e697c 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; =20 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 d680cbd..e3f8bb7 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -68,7 +68,7 @@ static uint64_t load_kernel(const char *kernel_filename) =20 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 3a0ca2f..7c4482b 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -34,7 +34,6 @@ =20 #define TCG_GUEST_DEFAULT_MO 0 =20 -#define ELF_MACHINE EM_RISCV #define CPUArchState struct CPURISCVState =20 #include "qemu-common.h" --=20 2.7.0