OvmfPkg/SmbiosPlatformDxe: split GetXenSmbiosTables() decl. to new header

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 <afish@apple.com>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien@xen.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210526201446.12554-40-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

diff --git a/Maintainers.txt b/Maintainers.txt
index 0a98227587c504bbc471cfb96ca850d5a8d325e3..a359919fef7f4d90f378a20d5e255407cf2ee1b2 100644 (file)
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -493,7 +493,7 @@ F: OvmfPkg/Library/XenPlatformLib/
 F: OvmfPkg/Library/XenRealTimeClockLib/\r
 F: OvmfPkg/OvmfXen.*\r
 F: OvmfPkg/OvmfXenElfHeaderGenerator.c\r
-F: OvmfPkg/SmbiosPlatformDxe/*Xen.c\r
+F: OvmfPkg/SmbiosPlatformDxe/*Xen*\r
 F: OvmfPkg/XenAcpiPlatformDxe/\r
 F: OvmfPkg/XenBusDxe/\r
 F: OvmfPkg/XenIoPciDxe/\r

diff --git a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c b/OvmfPkg/SmbiosPlatformDxe/ArmXen.c
index c2847f9053038d4b7067787ac9f8dff500ad1464..3dd849bbc0b497c75143bcf71bab119e0baf7509 100644 (file)
--- a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c
+++ b/OvmfPkg/SmbiosPlatformDxe/ArmXen.c
@@ -8,7 +8,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
-#include "SmbiosPlatformDxe.h"\r
+#include "XenSmbiosPlatformDxe.h"\r
 \r
 /**\r
   Locates the Xen SMBIOS data if it exists\r

diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 757bec879e4a8961c5456ec3beb9b0a73f367193..f280a1852ddd8bd00cac1c2c6f4466731542157d 100644 (file)
--- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -15,6 +15,7 @@
 #include <Protocol/Smbios.h>                  // EFI_SMBIOS_PROTOCOL\r
 \r
 #include "SmbiosPlatformDxe.h"\r
+#include "XenSmbiosPlatformDxe.h"\r
 \r
 #define TYPE0_STRINGS \\r
   "EFI Development Kit II / OVMF\0"     /* Vendor */ \\r

diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index ad42a326418cf410e2779589dfc88f261b720462..7a0bdbb2911f0731fa72771fbf37e4782d459d2e 100644 (file)
--- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -11,20 +11,6 @@
 #ifndef SMBIOS_PLATFORM_DXE_H_\r
 #define SMBIOS_PLATFORM_DXE_H_\r
 \r
-#include <IndustryStandard/SmBios.h> // SMBIOS_TABLE_ENTRY_POINT\r
-\r
-/**\r
-  Locates the Xen SMBIOS data if it exists\r
-\r
-  @return SMBIOS_TABLE_ENTRY_POINT   Address of Xen SMBIOS data\r
-\r
-**/\r
-SMBIOS_TABLE_ENTRY_POINT *\r
-GetXenSmbiosTables (\r
-  VOID\r
-  );\r
-\r
-\r
 /**\r
   Locates and extracts the QEMU SMBIOS table data if present in fw_cfg\r
 \r

diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 6063c0c9f609c8a7dd756a49a10792638868ffd2..140fa16ac135cf634b136bc174b57365fe0d79a3 100644 (file)
--- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -27,6 +27,7 @@
   Qemu.c\r
   SmbiosPlatformDxe.c\r
   SmbiosPlatformDxe.h\r
+  XenSmbiosPlatformDxe.h\r
 \r
 [Sources.IA32, Sources.X64]\r
   X86Xen.c\r

diff --git a/OvmfPkg/SmbiosPlatformDxe/X86Xen.c b/OvmfPkg/SmbiosPlatformDxe/X86Xen.c
index e0b1b29f80dbb4c3e943cb2ec2ba4752945a78b0..0acedf8995da28ac0382a9da61ffb51c9c7bdba4 100644 (file)
--- a/OvmfPkg/SmbiosPlatformDxe/X86Xen.c
+++ b/OvmfPkg/SmbiosPlatformDxe/X86Xen.c
@@ -12,7 +12,7 @@
 #include <Library/HobLib.h>  // GetFirstGuidHob()\r
 #include <Pi/PiHob.h>        // EFI_HOB_GUID_TYPE\r
 \r
-#include "SmbiosPlatformDxe.h"\r
+#include "XenSmbiosPlatformDxe.h"\r
 \r
 #define XEN_SMBIOS_PHYSICAL_ADDRESS       0x000EB000\r
 #define XEN_SMBIOS_PHYSICAL_END           0x000F0000\r

diff --git a/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.h b/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.h
new file mode 100644 (file)
index 0000000..850a8b6
--- /dev/null
+++ b/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.h
@@ -0,0 +1,28 @@
+/** @file\r
+  This driver installs SMBIOS information for OVMF on Xen\r
+\r
+  Copyright (C) 2021, Red Hat, Inc.\r
+  Copyright (c) 2011, Bei Guan <gbtju85@gmail.com>\r
+  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
+\r
+**/\r
+\r
+#ifndef XEN_SMBIOS_PLATFORM_DXE_H_\r
+#define XEN_SMBIOS_PLATFORM_DXE_H_\r
+\r
+#include <IndustryStandard/SmBios.h> // SMBIOS_TABLE_ENTRY_POINT\r
+\r
+/**\r
+  Locates the Xen SMBIOS data if it exists\r
+\r
+  @return SMBIOS_TABLE_ENTRY_POINT   Address of Xen SMBIOS data\r
+\r
+**/\r
+SMBIOS_TABLE_ENTRY_POINT *\r
+GetXenSmbiosTables (\r
+  VOID\r
+  );\r
+\r
+#endif\r