Received: by 2002:ac2:4c26:0:0:0:0:0 with SMTP id u6csp548085lfq; Tue, 8 Sep 2020 05:13:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnAmxsQFrczDhkF4H4I0SUNRunzAHx4Ra2tzlZ1D2/gSVoojlj1yzL4KtC46i4gsgScDNx X-Received: by 2002:a25:c750:: with SMTP id w77mr36403913ybe.17.1599567231724; Tue, 08 Sep 2020 05:13:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599567231; cv=none; d=google.com; s=arc-20160816; b=PiqbQmUtXdnuh8+SxhlaqZSSd9sHWgkFowKvuR/NOjJp+gYFyh+0LaHDidwJwhGjbK zkurnW8ZiwQAv4Lim5tvuTxAZtd8JSc33v7vb1StoMDKfZVtOXkmg4UnmKpsb1ohZanM fdM2zdrPXioZcoYfohDZYwKjsWzolWi5xVnNoity8QZP167OVVRdGxDvUcfD/qsX/c5X wUA7mEXIOnOH1wFIHSCPIKYUGyrpGeRZ/RKs83bDay5NeslMeoM5J7oEyjqNehntxqLr UB2mp3vO5geS/3GktudMPxG7TiGIuL5oHYENeSiE48jEANlPTQ4Ti5GprJuH5VmED78Q v8EQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1r+MKpb0Fe1tDNRacm0WsbAaCZgeR8IGCKDQUj+29m0=; b=v5URThGrQ2o/Yph2JHF3reRRQk+YxQofRpAlLuaaqAdY5CRFfyrMv5k9RQtQZYh1pP G8WUh1l30OZwkgkDo+maRa8un4DUiQWbxqdxcurl0x1tFUwMeereP9hG7OYl8FgBTdA4 67b7bFQgKE8zgfjrZiyELaepyGTbn+lTxKfH2sBda99VkB84RRzwp0rHS+2UGoMP8q9Q V98EMlAEkvx4lkBpoND5D0U4TFhbMS4VABAy8mJCf7EB0398L6YfoK3HZEiLMuWMOIZG M2YKMJS0s99izDNuPBuINbHtZXaDGI6a/IVZvSa/bixE1amPbNSuzfBg432avGdsO9qM V/BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=aUX2LZnQ; 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 s3si6472640ybq.178.2020.09.08.05.13.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Sep 2020 05:13:51 -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=aUX2LZnQ; 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]:56394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFcVT-0004zh-0h for alex.bennee@linaro.org; Tue, 08 Sep 2020 08:13:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFcTH-00016H-BM for qemu-arm@nongnu.org; Tue, 08 Sep 2020 08:11:35 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21156 helo=us-smtp-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 1kFcSy-0005ff-PQ for qemu-arm@nongnu.org; Tue, 08 Sep 2020 08:11:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599567066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1r+MKpb0Fe1tDNRacm0WsbAaCZgeR8IGCKDQUj+29m0=; b=aUX2LZnQ099UsAIIT8beXqc5jUmVNFYZjIFv8XwFivXxcdp0Ntnnrns64JtoM/oEd5Svl8 AVj4U9eBMCcMJWhLtiz6BeWLRqKDsUlIRejhks2Xww7KviSFkl9H4K8m3dEpbZ8uv/+Q9a 4oRcby5gAi23E1C6NfsRHHh1LnMWm7Q= 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-431-kgWSo7GINW6xca7IdCoD_g-1; Tue, 08 Sep 2020 08:11:03 -0400 X-MC-Unique: kgWSo7GINW6xca7IdCoD_g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C3B4018B9EBD; Tue, 8 Sep 2020 12:11:00 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 802BB5D9E2; Tue, 8 Sep 2020 12:10:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 76DA09D78; Tue, 8 Sep 2020 14:10:50 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v7 01/21] microvm: name qboot binary qboot.rom Date: Tue, 8 Sep 2020 14:10:30 +0200 Message-Id: <20200908121050.1162-2-kraxel@redhat.com> In-Reply-To: <20200908121050.1162-1-kraxel@redhat.com> References: <20200908121050.1162-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/08 00:33:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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: U5hWZJ8+k06g qboot isn't a bios and shouldnt be named that way. Signed-off-by: Gerd Hoffmann Reviewed-by: Sergio Lopez --- hw/i386/microvm.c | 4 ++-- pc-bios/meson.build | 2 +- pc-bios/{bios-microvm.bin => qboot.rom} | Bin roms/Makefile | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename pc-bios/{bios-microvm.bin => qboot.rom} (100%) diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 81d0888930d1..b1dc7e49c159 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/meson.build b/pc-bios/meson.build index 8087e5c0a7a1..b4aaf31143dd 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -27,7 +27,7 @@ endif blobs = files( 'bios.bin', 'bios-256k.bin', - 'bios-microvm.bin', + 'qboot.rom', 'sgabios.bin', 'vgabios.bin', 'vgabios-cirrus.bin', 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 5d9f15b6777f..2673a39f9dc2 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -66,7 +66,7 @@ default help: @echo " efi -- update UEFI (edk2) platform firmware" @echo " opensbi32-generic -- update OpenSBI for 32-bit generic machine" @echo " opensbi64-generic -- update OpenSBI for 64-bit generic machine" - @echo " bios-microvm -- update bios-microvm.bin (qboot)" + @echo " qboot -- update qboot" @echo " clean -- delete the files generated by the previous" \ "build targets" @@ -182,9 +182,9 @@ opensbi64-generic: cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf -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.27.0