From patchwork Tue Sep 10 19:04:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 11140625 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE848912 for ; Wed, 11 Sep 2019 08:38:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8F65B20863 for ; Wed, 11 Sep 2019 08:38:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F65B20863 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7y9F-00067D-3W for patchwork-qemu-devel@patchwork.kernel.org; Wed, 11 Sep 2019 04:38:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57116) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7xvo-0007X1-5A for qemu-devel@nongnu.org; Wed, 11 Sep 2019 04:24:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7xvn-0006T8-5A for qemu-devel@nongnu.org; Wed, 11 Sep 2019 04:24:51 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:44654) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7xvm-0006Sg-Vp for qemu-devel@nongnu.org; Wed, 11 Sep 2019 04:24:51 -0400 Received: by mail-wr1-f66.google.com with SMTP id k6so11297426wrn.11 for ; Wed, 11 Sep 2019 01:24:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:cc:from:to; bh=JhWZs3kYQOWNeKlb2pNkOyfw/b4rNeIZqwng3Q4zhcI=; b=JmtN2VKcN//7eHqucT+t4BPfWMNn5X9lnItNl/AeZkgsjNVUQNNhU0K+WaFe78574H 5BB/4czriSYAnHxv5KC/pU0yLKqN0XLBMlkzDpLlxAceaZR8CV2tklGcvgwO/dpRSBQs 8UcI/S3tUe8SAQKpqC8q9Iwo5EZzkki0LuD0y4q1NVfGKEIAbBz0toi/B3BAiWq8B+hy njIkIgLEQRJz3pADSNOdWfn0aJnAXVLE3HdSkOLqbCmTdngx+Kl1qNs3o1iBD+XoFyv0 YMyL4mGwc3FNfjIyqq+sVXvbUC/P7mwRtvpnsuDEvunlAr3kHc952yU53m61dI8y2hrw dilA== X-Gm-Message-State: APjAAAWNZ+tYRTUmeZyrP402XPMZuT5aoMWVquNHmyQMNT2KQ+kBzEM5 r8gLQxjSBKyxJJpmb0PaBitA+Q== X-Google-Smtp-Source: APXvYqzlnc+gSSy/GNPrH+PSb/iYULk/PXbNQ8Mk70Oaj5xbwlAvH3mZ73UihGSr+hbyQCqSsvlh2w== X-Received: by 2002:adf:dfc5:: with SMTP id q5mr31265090wrn.142.1568190289848; Wed, 11 Sep 2019 01:24:49 -0700 (PDT) Received: from localhost ([148.69.85.38]) by smtp.gmail.com with ESMTPSA id 17sm14025065wrl.15.2019.09.11.01.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2019 01:24:49 -0700 (PDT) Date: Tue, 10 Sep 2019 12:04:37 -0700 Message-Id: <20190910190513.21160-12-palmer@sifive.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190910190513.21160-1-palmer@sifive.com> References: <20190910190513.21160-1-palmer@sifive.com> MIME-Version: 1.0 From: Palmer Dabbelt To: Peter Maydell X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.221.66 Subject: [Qemu-devel] [PULL 11/47] riscv: Resolve full path of the given bios image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , Bin Meng , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Palmer Dabbelt Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng At present when "-bios image" is supplied, we just use the straight path without searching for the configured data directories. Like "-bios default", we add the same logic so that "-L" actually works. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Signed-off-by: Palmer Dabbelt --- hw/riscv/boot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 10f7991490..2e92fb0680 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -72,14 +72,14 @@ void riscv_find_and_load_firmware(MachineState *machine, firmware_filename = riscv_find_firmware(default_machine_firmware); } else { firmware_filename = machine->firmware; + if (strcmp(firmware_filename, "none")) { + firmware_filename = riscv_find_firmware(firmware_filename); + } } if (strcmp(firmware_filename, "none")) { /* If not "none" load the firmware */ riscv_load_firmware(firmware_filename, firmware_load_addr); - } - - if (!strcmp(machine->firmware, "default")) { g_free(firmware_filename); } }