From nobody Mon Feb 9 19:07:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+80783+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+80783+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631794847; cv=none; d=zohomail.com; s=zohoarc; b=a/81KeOrLYhJXddQaYjoN3OW5daik07ieWTPOG3EpO1mOW7vaGaxy4oaXEGPTCqbP6RYjY2eY9+REyLSDv7O1B0+b90PmGu22RZIGIFigltBUikPfwJ4PoNgERA4+1fbeNSG56kHD2Rxddk0etObGMInECbw9j4+5drc3sS0KFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631794847; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=dcF9jGf/E3GGg8+AGgf4NraYSe485DIF1w5GzR2WFJQ=; b=iy8MhdTX/M8jezjJuIoO8fw2lyPwSws3jMbjjx4O24eEpQKEqRa2tygY75JbD3BY0ToDGTSAji7vrRzMbrc84BKfvHmIw1RWKLGAt6MijAWdJP6gmhkN7Dg7mJYj7B6rCbbTzeseeCgFuCW0MMLMo3Mcu9Ric+hNwCJ5aSOKkOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+80783+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1631794847546386.5678450703581; Thu, 16 Sep 2021 05:20:47 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 57eIYY1788612xB37CTOsdNh; Thu, 16 Sep 2021 05:20:47 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.164.1631794846547003080 for ; Thu, 16 Sep 2021 05:20:46 -0700 X-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-162-jbcSY95NO0GPOXmwIsvSug-1; Thu, 16 Sep 2021 08:20:43 -0400 X-MC-Unique: jbcSY95NO0GPOXmwIsvSug-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AFBC88128E; Thu, 16 Sep 2021 12:20:41 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48ED76A902; Thu, 16 Sep 2021 12:20:41 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6E78318007A8; Thu, 16 Sep 2021 14:20:27 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jordan Justen , Gerd Hoffmann , Jiewen Yao , Julien Grall , Stefan Berger , Leif Lindholm , Ard Biesheuvel , Andrew Fish , Michael D Kinney , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony Perard , Jiewen Yao Subject: [edk2-devel] [PATCH v4 02/20] OvmfPkg/Microvm: rename output files, fix includes Date: Thu, 16 Sep 2021 14:20:09 +0200 Message-Id: <20210916122027.2352393-3-kraxel@redhat.com> In-Reply-To: <20210916122027.2352393-1-kraxel@redhat.com> References: <20210916122027.2352393-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: MP88ihVCkjsx1jLh5ARqhVVCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1631794847; bh=WAq2/u9QAHI8W3FMAcr8nJrRe/2DiSXIHnHrry7toCA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=DdQNj6+6lG7WeWQWk1YfCnUBlIFXlUwmwyDBeWAvGCpB6KdVeIzNXXw6NtcsSo6R+Pm s7+shc30Sc6BrpPmNkzPSWRTs7vZcFPGuOu5d8cG8j8+l/tkBHrr6gbkUPyZoqeTrzmqd gX+/AWWtrz9msdYtrkRt03qcTZbJTklsOnU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1631794849300100002 Content-Type: text/plain; charset="utf-8" Rename the firmware volume files (s/OVMF/MICROVM/). Fix includes so they work with microvm config being in a subdirectory. With this patch applied the build works. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3599 Signed-off-by: Gerd Hoffmann Acked-by: Jiewen Yao --- OvmfPkg/Microvm/MicrovmX64.dsc | 8 ++++---- OvmfPkg/Microvm/MicrovmX64.fdf | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index e56b83d95e09..97a8d90d749e 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -15,15 +15,15 @@ # ##########################################################################= ###### [Defines] - PLATFORM_NAME =3D Ovmf - PLATFORM_GUID =3D 5a9e7754-d81b-49ea-85ad-69eaa7b1539b + PLATFORM_NAME =3D Microvm + PLATFORM_GUID =3D 55a5d2cc-6ca6-47d1-8f4f-5588d7705194 PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x00010005 - OUTPUT_DIRECTORY =3D Build/OvmfX64 + OUTPUT_DIRECTORY =3D Build/MicrovmX64 SUPPORTED_ARCHITECTURES =3D X64 BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT - FLASH_DEFINITION =3D OvmfPkg/OvmfPkgX64.fdf + FLASH_DEFINITION =3D OvmfPkg/Microvm/MicrovmX64.fdf =20 # # Defines for default states. These can be changed on the command line. diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index 23936242e74a..5c1b85792e3e 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -11,20 +11,20 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce # image. # -[FD.OVMF] +[FD.MICROVM] BaseAddress =3D $(FW_BASE_ADDRESS) Size =3D $(FW_SIZE) ErasePolarity =3D 1 BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/VarStore.fdf.inc =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT @@ -36,16 +36,16 @@ [FD.OVMF] # Build the variable store and the firmware code as separate flash device # images. # -[FD.OVMF_VARS] +[FD.MICROVM_VARS] BaseAddress =3D $(FW_BASE_ADDRESS) Size =3D $(VARS_SIZE) ErasePolarity =3D 1 BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(VARS_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/VarStore.fdf.inc =20 -[FD.OVMF_CODE] +[FD.MICROVM_CODE] BaseAddress =3D $(CODE_BASE_ADDRESS) Size =3D $(CODE_SIZE) ErasePolarity =3D 1 @@ -427,7 +427,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 --=20 2.31.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80783): https://edk2.groups.io/g/devel/message/80783 Mute This Topic: https://groups.io/mt/85649931/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-