Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp909845lfm; Tue, 7 Jul 2020 05:54:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcEuiw1oiZK6wcxG2PhVQ8KOwqZ4oAivURPkFZpNB50s+aN5lSWAR5r0PrCRxoQ8mkVNNk X-Received: by 2002:a25:9706:: with SMTP id d6mr80579972ybo.220.1594126467557; Tue, 07 Jul 2020 05:54:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594126467; cv=none; d=google.com; s=arc-20160816; b=AJC+ZXSu4dpDURwwQFT+eVfhg0zTN4h62ufGfTUWRaQaWPykCLaRXD41eNUi+/d9EJ 5sPvYAzfAWTA5mV7WaVkvDPX4+5OAZ+/Wxjqj4+1wYzUR2VkXBS9gaF4J+6XvQzBO8zB PK7KloKR8e9xWnqOCFtLhretM3tjrsEoUFc3HQLRZC2vOAF4f26Sujpx98P2cPadv0bS UhHrNGBLU0J8l3+MJHkwB56EZLT9wI0mHdqsLUJuV672bZ5jSyRQZZ/n9gGszGuJqwPc iK+SGuZl1yxUXmqdtmKB5prvfGrkgQw+Bv9M4cDdWG7TS/Aen6Zo6hdpGqDNfl31Or9V Xc6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=d/4SzrO51wLCoiHfnRNqtnLD968Kuwi1FHNsO/et+5g=; b=gLiRw7qIJSkS5ZVi65cmn0uhbX5t9iGCfhS61j/AeGmvEFtRWY1uNJRFUyJY0GfRBK 3q1WS9Y788o0Rof8MypyOwHKNw3gPwu9YNP2B9fG8lOxHbg/O5CMSO3DI/4crIxSeh6E ZFM3vr1LxuIHwQVbA1Q/ZVhHXl7fQvpRsQwoj7kXQS7+wdfv/nuG5ABL/QuOWjyfpG/X 5+6kGo2avgbBv3rdFVdfetq6hRHSpDzMFrmvZJVBr9unEPxKU5bdq961qBZ77kE0+DYd 7FtjlKSAT2XuNSP70x8+0+zcyE4BL3God039BfET2b+07wxPc/eQhM6aNSr2Tzpsyynu 2eNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=IWUOjyKH; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r9si21474284ybm.175.2020.07.07.05.54.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jul 2020 05:54:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=IWUOjyKH; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:51354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsn7C-0007KV-U3 for alex.bennee@linaro.org; Tue, 07 Jul 2020 08:54:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsn73-0007KN-NT for qemu-arm@nongnu.org; Tue, 07 Jul 2020 08:54:17 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:22335 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jsn70-0004kD-Qr for qemu-arm@nongnu.org; Tue, 07 Jul 2020 08:54:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594126453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=d/4SzrO51wLCoiHfnRNqtnLD968Kuwi1FHNsO/et+5g=; b=IWUOjyKHFS52yJEfkohKdELw5yGpVV+QnJqPPSznZZtwQDRHgLl9I8MURMJRgKO2iz3n0X meIZelquIOG4sFpm2Z0FN08hkkxRQ3m48s7At1kZlhLd42mC5qskpNxOgdDOLYhgrKsoxl Vj+e/bW9dkllvaxZl95VBrIwEyNmZTM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-408-dqKA9R8iNjyMII90ISFL4A-1; Tue, 07 Jul 2020 08:54:11 -0400 X-MC-Unique: dqKA9R8iNjyMII90ISFL4A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9618B108BD0D; Tue, 7 Jul 2020 12:54:10 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id C77C87846E; Tue, 7 Jul 2020 12:53:57 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id EAE0E31F0A; Tue, 7 Jul 2020 14:53:56 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 01/20] microvm: name qboot binary qboot.rom Date: Tue, 7 Jul 2020 14:53:37 +0200 Message-Id: <20200707125356.32450-2-kraxel@redhat.com> In-Reply-To: <20200707125356.32450-1-kraxel@redhat.com> References: <20200707125356.32450-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 00:31:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Shannon Zhao , qemu-arm@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: JJEldV4A0RF5 qboot isn't a bios and shouldnt be named that way. Signed-off-by: Gerd Hoffmann --- hw/i386/microvm.c | 4 ++-- pc-bios/{bios-microvm.bin => qboot.rom} | Bin roms/Makefile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename pc-bios/{bios-microvm.bin => qboot.rom} (100%) diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 5e931975a06d..1300c396947b 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -47,7 +47,7 @@ #include "kvm_i386.h" #include "hw/xen/start_info.h" -#define MICROVM_BIOS_FILENAME "bios-microvm.bin" +#define MICROVM_QBOOT_FILENAME "qboot.rom" static void microvm_set_rtc(MicrovmMachineState *mms, ISADevice *s) { @@ -158,7 +158,7 @@ static void microvm_devices_init(MicrovmMachineState *mms) } if (bios_name == NULL) { - bios_name = MICROVM_BIOS_FILENAME; + bios_name = MICROVM_QBOOT_FILENAME; } x86_bios_rom_init(get_system_memory(), true); } diff --git a/pc-bios/bios-microvm.bin b/pc-bios/qboot.rom similarity index 100% rename from pc-bios/bios-microvm.bin rename to pc-bios/qboot.rom diff --git a/roms/Makefile b/roms/Makefile index f9acf39954dc..b185c880541c 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -68,7 +68,7 @@ default help: @echo " opensbi64-virt -- update OpenSBI for 64-bit virt machine" @echo " opensbi32-sifive_u -- update OpenSBI for 32-bit sifive_u machine" @echo " opensbi64-sifive_u -- update OpenSBI for 64-bit sifive_u machine" - @echo " bios-microvm -- update bios-microvm.bin (qboot)" + @echo " qboot -- update qboot" @echo " clean -- delete the files generated by the previous" \ "build targets" @@ -194,9 +194,9 @@ opensbi64-sifive_u: PLATFORM="sifive/fu540" cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin -bios-microvm: +qboot: $(MAKE) -C qboot - cp qboot/bios.bin ../pc-bios/bios-microvm.bin + cp qboot/bios.bin ../pc-bios/qboot.rom clean: rm -rf seabios/.config seabios/out seabios/builds -- 2.18.4