From nobody Wed Oct 29 11:49:23 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 1525563713813196.17560978523386; Sat, 5 May 2018 16:41:53 -0700 (PDT) Received: from localhost ([::1]:40285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6oL-0007On-1N for importer@patchew.org; Sat, 05 May 2018 19:41:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6jj-0003ru-IM for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fF6jg-0003ay-TK for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:07 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:36607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fF6jg-0003ah-Nm for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:04 -0400 Received: by mail-pg0-x242.google.com with SMTP id z129-v6so13605838pgz.3 for ; Sat, 05 May 2018 16:37:04 -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.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 May 2018 16:37:03 -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=DeouxeLzQKj/gPyu8YlTJo/W0FtOGv/F5LWE1yLn8uE=; b=fSxQ0ZeRxHU2sEStDBhIAKoIin/cAjJgLqQ4rqMIIPs6FQT+BMDRBvhqiTkkj2Bmul pKbxR47QJXW8mhjyZzPuwOueh93cX03t5lSRVPDdAPqYSFvdqqdxOt6qDoctdcCXJCdP Nhk/YwNwgkynRTz9Pn4hSDzIm8t1MpRyXNyMA//uX1a326LXHDQmPY0nM8u8jC/UiZWV AHd4jarg3dK6N+Zr6VQseIwE5wchPoXW0Gr5LyllzBJsPo7FF/78HoFGM6si4O933XKk 73TfP6Q/3kM0mxmSN14+x319m3NE6Y/ZpTzBlu7oC6AN6n4kWg8wkHVSDYVD6FY/Z3xs dkwg== 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=DeouxeLzQKj/gPyu8YlTJo/W0FtOGv/F5LWE1yLn8uE=; b=P3mRI1UDIZyU913HpCURnP0aQGrnTzUIGihW/7D6JQ8f2XU5b5HcB+0NBXUTTf4jT6 XkUOAOz+zQecdc3bdU6z03Dg5W+hTdRXsoUpuLBSh+4eOzO3eercfTvq92u751Yjskdo D5L8O+3VL7vG2ac/hcLARVeEQ5hYbXQenX00cDp2/GLrBa/9Zd5J8oPgrrTx8ogluegv HfeLqWiZ0R4SdZM79hF+AME3BhSFyGQu9rTIeHsQpgsBumKSxkeuJORvO6XeTtOjQ1uq ybnEtxb1Bqn9Gc+FV6HZCIuqgHucqbIWqMdTyitOHvSf8nGlv+e3dd/iU81DgCHGQbR8 ZxjA== X-Gm-Message-State: ALQs6tD2pAmiURVHbMAF5K3Y+NVlY5jdVBr/UkfnTUzuX3prmldhAnkT 1DFjzu1rYdypesV0b/OXiH5pJiojWSU= X-Google-Smtp-Source: AB8JxZrKCr70dVVzjD+X0u8mJUF0iQ4fdGkaXBjN6F+4ERmnYDKDA189OGCUJkv9dgbH1ME4dJVILw== X-Received: by 2002:a63:aa01:: with SMTP id e1-v6mr26220921pgf.331.1525563423665; Sat, 05 May 2018 16:37:03 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Sun, 6 May 2018 11:35:09 +1200 Message-Id: <1525563325-62963-5-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 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:c05::242 Subject: [Qemu-devel] [PULL 04/20] RISC-V: Remove identity_translate from load_elf 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 When load_elf is called with NULL as an argument to the address translate callback, it does an identity translation. This commit removes the redundant identity_translate callback. Cc: Sagar Karandikar Cc: Bastian Koppelmann Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/riscv/sifive_e.c | 7 +------ hw/riscv/sifive_u.c | 7 +------ hw/riscv/spike.c | 7 +------ hw/riscv/virt.c | 7 +------ 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 487244890ef8..3e523a073469 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -82,16 +82,11 @@ static void copy_le32_to_phys(hwaddr pa, uint32_t *rom,= size_t len) } } =20 -static uint64_t identity_translate(void *opaque, uint64_t addr) -{ - return addr; -} - static uint64_t load_kernel(const char *kernel_filename) { uint64_t kernel_entry, kernel_high; =20 - if (load_elf(kernel_filename, identity_translate, NULL, + if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, 0, ELF_MACHINE, 1, 0) < 0) { error_report("qemu: could not load kernel '%s'", kernel_filename); diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 1bd2bde9b871..adc6c2266275 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -68,16 +68,11 @@ static void copy_le32_to_phys(hwaddr pa, uint32_t *rom,= size_t len) } } =20 -static uint64_t identity_translate(void *opaque, uint64_t addr) -{ - return addr; -} - static uint64_t load_kernel(const char *kernel_filename) { uint64_t kernel_entry, kernel_high; =20 - if (load_elf(kernel_filename, identity_translate, NULL, + if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, 0, ELF_MACHINE, 1, 0) < 0) { error_report("qemu: could not load kernel '%s'", kernel_filename); diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index ae82f4eb6341..cf7f9bcc3950 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -59,16 +59,11 @@ static void copy_le32_to_phys(hwaddr pa, uint32_t *rom,= size_t len) } } =20 -static uint64_t identity_translate(void *opaque, uint64_t addr) -{ - return addr; -} - static uint64_t load_kernel(const char *kernel_filename) { uint64_t kernel_entry, kernel_high; =20 - if (load_elf_ram_sym(kernel_filename, identity_translate, NULL, + if (load_elf_ram_sym(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, 0, ELF_MACHINE, 1, 0, NULL, true, htif_symbol_callback) < 0) { error_report("qemu: could not load kernel '%s'", kernel_filename); diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 3cc9c8090bfb..c2aa795981d2 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -62,16 +62,11 @@ static void copy_le32_to_phys(hwaddr pa, uint32_t *rom,= size_t len) } } =20 -static uint64_t identity_translate(void *opaque, uint64_t addr) -{ - return addr; -} - static uint64_t load_kernel(const char *kernel_filename) { uint64_t kernel_entry, kernel_high; =20 - if (load_elf(kernel_filename, identity_translate, NULL, + if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, 0, ELF_MACHINE, 1, 0) < 0) { error_report("qemu: could not load kernel '%s'", kernel_filename); --=20 2.7.0