From nobody Sat Oct 25 21:46:14 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521230484108942.2894816086932; Fri, 16 Mar 2018 13:01:24 -0700 (PDT) Received: from localhost ([::1]:59305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewvXR-0005ts-Rp for importer@patchew.org; Fri, 16 Mar 2018 16:01:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewvFJ-0007Wp-SJ for qemu-devel@nongnu.org; Fri, 16 Mar 2018 15:42:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewvFI-0003oB-SX for qemu-devel@nongnu.org; Fri, 16 Mar 2018 15:42:33 -0400 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:38496) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewvFI-0003ns-MP for qemu-devel@nongnu.org; Fri, 16 Mar 2018 15:42:32 -0400 Received: by mail-pl0-x241.google.com with SMTP id m22-v6so6505552pls.5 for ; Fri, 16 Mar 2018 12:42:32 -0700 (PDT) Received: from monty.com ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id k24sm13780469pff.77.2018.03.16.12.42.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Mar 2018 12:42:31 -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=JjGyplqqVlE4UQ9tNmqboa5lGCOAOgUeBOIRDmEp87s=; b=UdS1d2xLuB5HshQDBWd3C1uIoMGJdB+J1H/hHD8yCNF6LCHTnBx0SAvmMkrejPybvS vsnBALqI0rgYyfOexOZUltFUWrHG8n+8hIONmlnjPlMzUBLAI0JZFoiYf48Pz31vZI2t sObKHUE2mak5z5j2WjWtIiVBN5yt1RrMTJ2A6CJPs61SfAEp8PteCg+N25hgXANrpO3g +Gs6WsugQrcDBJZdFes/lTKYz9I5bQxlaUqtd7ZEFaJYnQilye3wuvO3C/Yetg8Do5Tt foRtYnl5Xy8qI47EZDMwOtIQmQSJtyEqPn2wE5sGVoP1db0yiCOFHfMJPM68Otp230Jr CVEw== 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=JjGyplqqVlE4UQ9tNmqboa5lGCOAOgUeBOIRDmEp87s=; b=cB4fLGIUEHhPEioWsVKGlUWL4srVNxxvyRQOiKVFkq+vIr7nY2xdGGujEuXzEJ7C/N URLQd5qBJUtlGFdIob0lK/3S/MV6avY2IsWx1O96BSGWKue5yo8bH1ZJ+R2FHGQqkHFZ rUkeyuMTl6yB+xZKg71auqxLLTgSRIBiXWa3JjG+MbZ/GJmqNwWbbNPvMZzIkkzUpr4h lPEkvwPg0eMm3mx0DlTDMMQ7jpiseQotBe2+ctpo2xdThM4wrWHhz2MnUoMU75oNeEtO cJyfpIHVjuZPtdZOlV8MFKQpsfkylrFth3WpdNmPxYdXddYO5NMgOHifIuaWUcLKDmxJ HlRw== X-Gm-Message-State: AElRT7HSWJwxYT++RSGfikoomHieW9w3ARqjlhJkdBln23N9F/D0MeVD VzLQeZX5EkpL4Xz7ZzW/19Ho99OohvQ= X-Google-Smtp-Source: AG47ELu9NQ1bdBvl86x1/54bHL/UCBNlnr6CAA+FC6Lp8lahQLAm1v4Aj7RjW3MohR8uzU1XcgzkiA== X-Received: by 2002:a17:902:8d87:: with SMTP id v7-v6mr3374123plo.146.1521229351680; Fri, 16 Mar 2018 12:42:31 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Fri, 16 Mar 2018 12:41:13 -0700 Message-Id: <1521229281-73637-17-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1521229281-73637-1-git-send-email-mjc@sifive.com> References: <1521229281-73637-1-git-send-email-mjc@sifive.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PATCH v3 16/24] 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+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 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=C3=A9 --- 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