From nobody Tue Feb 10 04:14:12 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+75712+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+75712+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622062700; cv=none; d=zohomail.com; s=zohoarc; b=UMVYTqWLst6H+DdSNUfXbnegz6YeAkvwRnV+/cop1oVqKbvN6W/7gQGVNHv6t2OyPhoININiFdVYH6eF1JjzskO/fpdLbPlZ21O1r9DFU0yNQo6eZ5pEOnOFjem0BYa+X87TV40NDniDu2lM5WulyF52FdU179HhmgbZ4kIztpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622062700; 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=BpK4BPgG5LL/r8H1MYOzBYzqqC6V5Ige2W1zMaqzCkY=; b=mfeZDXZaN0oP2c2aigHu1nrmhdLCdoLon6X1UCKs5MjhkCNBRNpN79tLvNioxpRiO22WZ06d5Z+yxoNTMb5ep/3sEUhQJ980KJMrUgMHj732XW0+NBHqiLDfTEEAcsdWT3X0Sddz3Nj13kn4IYKYHPx+2hKUvfzzE0D56gDTI+w= 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+75712+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1622062700694538.0725177868477; Wed, 26 May 2021 13:58:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id z3gAYY1788612x4sJ8CPGFj7; Wed, 26 May 2021 13:58:20 -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.web08.3407.1622062699661536053 for ; Wed, 26 May 2021 13:58:19 -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-550-BB2rifhMNKWx4mZHHHaI4A-1; Wed, 26 May 2021 16:58:16 -0400 X-MC-Unique: BB2rifhMNKWx4mZHHHaI4A-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA2848042A3; Wed, 26 May 2021 20:58:15 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-61.ams2.redhat.com [10.36.114.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5059B19D9D; Wed, 26 May 2021 20:58:14 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [PATCH 41/43] OvmfPkg/SmbiosPlatformDxe: create Xen-specific module INF file Date: Wed, 26 May 2021 22:14:44 +0200 Message-Id: <20210526201446.12554-42-lersek@redhat.com> In-Reply-To: <20210526201446.12554-1-lersek@redhat.com> References: <20210526201446.12554-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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,lersek@redhat.com X-Gm-Message-State: Tp560fhWsXA3l3iBeG4iZXMzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1622062700; bh=BpK4BPgG5LL/r8H1MYOzBYzqqC6V5Ige2W1zMaqzCkY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=tuzGpqYGf4/7u5GJ6aHBd3PBVbIqTSmXMjFCxbK6OUwcsTgKXUp+OsskOjMj9ycQQ79 CtvUoBOQFVYCKOQAmWNZ75VGbot/OQFlxC45eh68LxM+eG7Jt9F7MO4VB3JiRcmVxJOdU EDt6Srb7V/i0aOurorutVERHQDbEskUZNRM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" "OvmfPkg/SmbiosPlatformDxe" is structured somewhat differently from the drivers duplicated and trimmed thus far in this series. The final QEMU and Xen versions will share a relatively significant amount of code, therefore duplicating the whole driver is less useful, even temporarily. Instead, duplicate the INF file, in preparation for customizing the entry point function. Because ArmVirtXen doesn't actually include OvmfPkg/SmbiosPlatformDxe [*], there is only one platform that's supposed to consume the new driver: OvmfXen. Switch OvmfXen to the new driver at once. [*] See commit 164cf4038357 ("OvmfPkg: SmbiosPlatformDxe: restrict current Xen code to IA32/X64", 2015-07-26). This patch is best viewed with "git show --find-copies-harder". Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Julien Grall Cc: Philippe Mathieu-Daud=C3=A9 Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2122 Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/OvmfXen.dsc = | 2 +- OvmfPkg/OvmfXen.fdf = | 2 +- OvmfPkg/SmbiosPlatformDxe/{SmbiosPlatformDxe.inf =3D> XenSmbiosPlatformDxe= .inf} | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 0986d9f5c356..3c1ca6bfd493 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -642,13 +642,13 @@ [Components] # SMBIOS Support # MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf { NULL|OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.inf } - OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf + OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf =20 # # ACPI Support # MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf OvmfPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 9acc7c93b98b..aeb9336fd5b7 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -345,13 +345,13 @@ [FV.DXEFV] !if $(SOURCE_DEBUG_ENABLE) =3D=3D FALSE INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf !endif INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf =20 INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf -INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +INF OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf =20 INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf INF OvmfPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorD= xe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphics= ResourceTableDxe.inf diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/Smbi= osPlatformDxe/XenSmbiosPlatformDxe.inf similarity index 80% copy from OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf copy to OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf index 140fa16ac135..5a093c69afd9 100644 --- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf @@ -1,20 +1,21 @@ ## @file -# This driver installs SMBIOS information for OVMF +# This driver installs SMBIOS information for OVMF on Xen # +# Copyright (C) 2021, Red Hat, Inc. # Copyright (c) 2011, Bei Guan # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # ## =20 [Defines] INF_VERSION =3D 0x00010005 - BASE_NAME =3D SmbiosPlatformDxe - FILE_GUID =3D 4110465d-5ff3-4f4b-b580-24ed0d06747a + BASE_NAME =3D XenSmbiosPlatformDxe + FILE_GUID =3D c41f0579-5598-40f1-95db-3983c8ebbe2a MODULE_TYPE =3D DXE_DRIVER VERSION_STRING =3D 1.0 =20 ENTRY_POINT =3D SmbiosTablePublishEntry =20 # --=20 2.19.1.3.g30247aa5d201 -=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 (#75712): https://edk2.groups.io/g/devel/message/75712 Mute This Topic: https://groups.io/mt/83111208/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-