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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152036969821043.8254855493858; Tue, 6 Mar 2018 12:54:58 -0800 (PST) Received: from localhost ([::1]:58109 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJbt-0005Mh-D9 for importer@patchew.org; Tue, 06 Mar 2018 15:54:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJSk-00064D-3W for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etJSj-0003Od-8H for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:30 -0500 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:34360) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etJSj-0003OO-2O for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:29 -0500 Received: by mail-pl0-x244.google.com with SMTP id u13-v6so12548191plq.1 for ; Tue, 06 Mar 2018 12:45:28 -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.45.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 12:45:27 -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=lprSHFqExa/Z6LNZE3bF+YA8j0UmGrEdylOwOkcB5/o=; b=DzoOmZPYjwUz1B0vAJJDqJWYQsXKUr5F80jkwdpUtZcqQ7LnZGz0KXE4zR3bHWlXz/ +L66JxY5oXbZXUb9sosJtXwB4e6mHSbBcGgNolsNmIJndtTiTZaqyXFVgq8MzZ4B8JRS 9e45DNHJmKo5KpTTI8/3wM5LRNYfh7kE3BvCfJwMrBq507KB8KaG9L7PESasolM4Cb9i p+5rTpvQ8z4v3pQMXXhQeBJxsCBiovwRpLxCze2V/tsgmqeT3eC4IA4T8tIHNdGkkpkh Vq9jrb/byMT/tYuFj5nKDeDqlXwgdJYjCqVBhOqeXIRu7d6/mezbG8dfJX5kP3RDK7O9 j7XQ== 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=lprSHFqExa/Z6LNZE3bF+YA8j0UmGrEdylOwOkcB5/o=; b=jqm15sWbuHpHW5MAuIwXkNsgus9VQSHMU7E3nBMhy4kJospaTi5HzeTJWOgDM8Ix6z Uv3GXVbJvv2vL/WoIHYfE9GyVs9L9lo7U95oOsnxWNTArRen/jmTEqrZ+Xb/Dp+QIILp VSlG+XonECR54AmkoQ4c5AxSdnc9X9yt4jw7dWZTV6UibMjOazjqPmpxv9+DSJ7zTX9O T3/gnW5Yz8g66oo820DQBc5F+chLQ9R34eMcr1AiKnvTFsHfkTFlCejDVSUchpMJ/7Y3 VPuwesyUvLjgEHaRR0EJNAvwrjBxoFWkhDT9mZq+IsUpP58DYs4beZ9YWmL5oakmlOUd S4iw== X-Gm-Message-State: APf1xPBMXxG4quCVcwVb8Afjf/v/zUZnpEQa7UQ5y1+ndD62KoDTypqY lJvIsfUH0OdVkMGKN2k6Z2/87UKtJXc= X-Google-Smtp-Source: AG47ELu1elLRGoLcgYp2lxv5xVpxuHDvodojly7iE5JV/FoAdS1HXo+vdkRVBrRiFZpt50NbYekmjQ== X-Received: by 2002:a17:902:8215:: with SMTP id x21-v6mr18202076pln.164.1520369127983; Tue, 06 Mar 2018 12:45:27 -0800 (PST) From: Michael Clark To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 09:43:40 +1300 Message-Id: <1520369037-37977-6-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::244 Subject: [Qemu-devel] [PATCH v1 05/22] RISC-V: Remove redundant identity_translate 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" 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. Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 19eca36..09c9d49 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 f3f7615..6116c38 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 4c233ec..7710333 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 0d101fc..f8c19b4 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