From nobody Mon Feb 9 18:43:24 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+75710+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+75710+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622062575; cv=none; d=zohomail.com; s=zohoarc; b=h1ShDx+w9h7M7gjuu4jtkQaWx/A0UB8NDWm2BhC6OsNJjZWbsFOOz6BsS0IaVRMYgLA4z0ZAfuB9pQo7qN9YZmrbkEUBVSdTLbQQbAS+GcO3/MLqLHVesUDHa86NEYJdoFvYMhI/ManD+gmUaE0dBMLoFUcNS3ICauTmXGpLJVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622062575; 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=NuHSfv9AyaFgwxsPF5W85vhdRlxz/WLqiLswoAa/8og=; b=RMyEEc5bP/I/hk0uAeXo8lww6Ej2+TLHn75IxyagBoVac/TfNcxYCvKxO+BRfvL+7Wbh0b+JgunPRd7CPG0Vz02/EHZaXlUJI0to6H1+cgf6CSq1V4SheyVc+mNqahOX6nXxXySfPY0zzNkZvCFpQdJiHhdWIuHdMkGASK0ehgQ= 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+75710+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 1622062575685639.6626374192421; Wed, 26 May 2021 13:56:15 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tvtnYY1788612xnaauPr1Kl3; Wed, 26 May 2021 13:56:15 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web10.3310.1622062574815381537 for ; Wed, 26 May 2021 13:56:15 -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-453-IPxRBNY3OrK7XnoUL4_mhA-1; Wed, 26 May 2021 16:56:12 -0400 X-MC-Unique: IPxRBNY3OrK7XnoUL4_mhA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7913107ACE4; Wed, 26 May 2021 20:56:10 +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 EF2997013C; Wed, 26 May 2021 20:56:08 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Andrew Fish , Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , Leif Lindholm , Michael D Kinney , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [PATCH 39/43] OvmfPkg/SmbiosPlatformDxe: split GetXenSmbiosTables() decl. to new header Date: Wed, 26 May 2021 22:14:42 +0200 Message-Id: <20210526201446.12554-40-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.79 on 10.5.11.12 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: X6NUnUHISvte2yxDtemDpEJvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1622062575; bh=NuHSfv9AyaFgwxsPF5W85vhdRlxz/WLqiLswoAa/8og=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=FMKbRpa7Z1EHXa0Qp234d4xbHOGpH+KXnOgsxqWnYxkY5zG2baG9KkP0kyjZsVN0Uh4 ZUC6TSsFFwNHm2UP08I0EDukyoA0mTtwZmWAZu7IBgMKLGiD9W1soidVGWaO5LT5qm2cM G/HDuLOleyAqpvCNgGMBnMCdVYjkXJOhFYs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Move the declaration of the GetXenSmbiosTables() function to a new header file called "XenSmbiosPlatformDxe.h". (The only declaration that remains in "SmbiosPlatformDxe.h" for now is that of GetQemuSmbiosTables().) Modify the pattern in "Maintainers.txt" so that the new file be covered in the "OvmfPkg: Xen-related modules" section. This patch is best viewed with "git show --no-renames". Cc: Andrew Fish Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Julien Grall Cc: Leif Lindholm Cc: Michael D Kinney 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/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 1 + Maintainers.txt | 2 +- OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h | 14 ------= -------- OvmfPkg/SmbiosPlatformDxe/{ArmXen.c =3D> XenSmbiosPlatformDxe.h} | 20 ++++= ++++++---------- OvmfPkg/SmbiosPlatformDxe/ArmXen.c | 2 +- OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 1 + OvmfPkg/SmbiosPlatformDxe/X86Xen.c | 2 +- 7 files changed, 15 insertions(+), 27 deletions(-) diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/Smbi= osPlatformDxe/SmbiosPlatformDxe.inf index 6063c0c9f609..140fa16ac135 100644 --- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -24,12 +24,13 @@ [Defines] # =20 [Sources] Qemu.c SmbiosPlatformDxe.c SmbiosPlatformDxe.h + XenSmbiosPlatformDxe.h =20 [Sources.IA32, Sources.X64] X86Xen.c =20 [Sources.ARM, Sources.AARCH64] ArmXen.c diff --git a/Maintainers.txt b/Maintainers.txt index e5f419e67f0c..751477e8e62a 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -499,13 +499,13 @@ F: OvmfPkg/Library/XenConsoleSerialPortLib/ F: OvmfPkg/Library/XenHypercallLib/ F: OvmfPkg/Library/XenIoMmioLib/ F: OvmfPkg/Library/XenPlatformLib/ F: OvmfPkg/Library/XenRealTimeClockLib/ F: OvmfPkg/OvmfXen.* F: OvmfPkg/OvmfXenElfHeaderGenerator.c -F: OvmfPkg/SmbiosPlatformDxe/*Xen.c +F: OvmfPkg/SmbiosPlatformDxe/*Xen* F: OvmfPkg/XenAcpiPlatformDxe/ F: OvmfPkg/XenBusDxe/ F: OvmfPkg/XenIoPciDxe/ F: OvmfPkg/XenIoPvhDxe/ F: OvmfPkg/XenPlatformPei/ F: OvmfPkg/XenPvBlkDxe/ diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/OvmfPkg/Smbios= PlatformDxe/SmbiosPlatformDxe.h index ad42a326418c..7a0bdbb2911f 100644 --- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h +++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h @@ -8,26 +8,12 @@ =20 **/ =20 #ifndef SMBIOS_PLATFORM_DXE_H_ #define SMBIOS_PLATFORM_DXE_H_ =20 -#include // SMBIOS_TABLE_ENTRY_POINT - -/** - Locates the Xen SMBIOS data if it exists - - @return SMBIOS_TABLE_ENTRY_POINT Address of Xen SMBIOS data - -**/ -SMBIOS_TABLE_ENTRY_POINT * -GetXenSmbiosTables ( - VOID - ); - - /** Locates and extracts the QEMU SMBIOS table data if present in fw_cfg =20 @return Address of extracted QEMU SMBIOS data =20 **/ diff --git a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c b/OvmfPkg/SmbiosPlatformDxe= /XenSmbiosPlatformDxe.h similarity index 56% copy from OvmfPkg/SmbiosPlatformDxe/ArmXen.c copy to OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.h index c2847f905303..850a8b662cd5 100644 --- a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c +++ b/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.h @@ -1,28 +1,28 @@ /** @file - Detect Xen SMBIOS data on ARM / AARCH64. + This driver installs SMBIOS information for OVMF on Xen =20 - Copyright (C) 2015, Red Hat, Inc. + Copyright (C) 2021, Red Hat, Inc. Copyright (c) 2011, Bei Guan Copyright (c) 2011, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent + **/ =20 -#include "SmbiosPlatformDxe.h" +#ifndef XEN_SMBIOS_PLATFORM_DXE_H_ +#define XEN_SMBIOS_PLATFORM_DXE_H_ + +#include // SMBIOS_TABLE_ENTRY_POINT =20 /** Locates the Xen SMBIOS data if it exists =20 @return SMBIOS_TABLE_ENTRY_POINT Address of Xen SMBIOS data =20 **/ SMBIOS_TABLE_ENTRY_POINT * GetXenSmbiosTables ( VOID - ) -{ - // - // Not implemented yet. - // - return NULL; -} + ); + +#endif diff --git a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c b/OvmfPkg/SmbiosPlatformDxe= /ArmXen.c index c2847f905303..3dd849bbc0b4 100644 --- a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c +++ b/OvmfPkg/SmbiosPlatformDxe/ArmXen.c @@ -5,13 +5,13 @@ Copyright (c) 2011, Bei Guan Copyright (c) 2011, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 -#include "SmbiosPlatformDxe.h" +#include "XenSmbiosPlatformDxe.h" =20 /** Locates the Xen SMBIOS data if it exists =20 @return SMBIOS_TABLE_ENTRY_POINT Address of Xen SMBIOS data =20 diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/OvmfPkg/Smbios= PlatformDxe/SmbiosPlatformDxe.c index 757bec879e4a..f280a1852ddd 100644 --- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c +++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c @@ -12,12 +12,13 @@ #include // ASSERT_EFI_ERROR() #include // FreePool() #include // gBS #include // EFI_SMBIOS_PROTOCOL =20 #include "SmbiosPlatformDxe.h" +#include "XenSmbiosPlatformDxe.h" =20 #define TYPE0_STRINGS \ "EFI Development Kit II / OVMF\0" /* Vendor */ \ "0.0.0\0" /* BiosVersion */ \ "02/06/2015\0" /* BiosReleaseDate */ // diff --git a/OvmfPkg/SmbiosPlatformDxe/X86Xen.c b/OvmfPkg/SmbiosPlatformDxe= /X86Xen.c index e0b1b29f80db..0acedf8995da 100644 --- a/OvmfPkg/SmbiosPlatformDxe/X86Xen.c +++ b/OvmfPkg/SmbiosPlatformDxe/X86Xen.c @@ -9,13 +9,13 @@ **/ =20 #include // AsciiStrnCmp() #include // GetFirstGuidHob() #include // EFI_HOB_GUID_TYPE =20 -#include "SmbiosPlatformDxe.h" +#include "XenSmbiosPlatformDxe.h" =20 #define XEN_SMBIOS_PHYSICAL_ADDRESS 0x000EB000 #define XEN_SMBIOS_PHYSICAL_END 0x000F0000 =20 /** Validates the SMBIOS entry point structure --=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 (#75710): https://edk2.groups.io/g/devel/message/75710 Mute This Topic: https://groups.io/mt/83111160/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-