OvmfPkg, ArmVirtualizationPkg: clean up XenHypercallLib names

Perform the following renames in order to stick with edk2 tradition more
closely:

  XenHypercallLibArm, XenHypercallLibIntel  ->  XenHypercallLib
  XenHypercallIntel                         ->  X86XenHypercall

In addition, we unify the INF files.

This patch modifies ArmVirtualizationPkg and OvmfPkg at once, in order to
keep both bisectable (client code shouldn't break).

Suggested-by: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16998 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 24 insertions, 53 deletions

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
index 9cc926c382..b24d0969e0 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
@@ -33,7 +33,7 @@
 [LibraryClasses]

   SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf

   RealTimeClockLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf

-  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLibArm.inf

+  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf

 

 [LibraryClasses.AARCH64]

   ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf

diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercallIntel.c b/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c
index fc52823f23..7ee1f2f38d 100644
--- a/OvmfPkg/Library/XenHypercallLib/XenHypercallIntel.c
+++ b/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c
@@ -37,7 +37,7 @@ __XenHypercall2 (
 

 RETURN_STATUS

 EFIAPI

-XenHypercallLibIntelInit (

+XenHypercallLibInit (

   VOID

   )

 {

diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf b/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
index 2afd608f4a..efc26fefab 100644
--- a/OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf
+++ b/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
@@ -1,5 +1,5 @@
 ## @file

-#  Xen Hypercall abstraction lib for Intel architecture

+#  Xen Hypercall abstraction lib for Intel and ARM architectures

 #

 #  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>

 #  This program and the accompanying materials

@@ -14,21 +14,26 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = XenHypercallLibIntel

+  BASE_NAME                      = XenHypercallLib

   FILE_GUID                      = B5EE9A32-CA5A-49A8-82E3-ADA4CCB77C7C

   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

+

+[Defines.IA32, Defines.X64]

   LIBRARY_CLASS                  = XenHypercallLib|DXE_DRIVER UEFI_DRIVER

-  CONSTRUCTOR                    = XenHypercallLibIntelInit

+  CONSTRUCTOR                    = XenHypercallLibInit

+

+[Defines.ARM, Defines.AARCH64]

+  LIBRARY_CLASS                  = XenHypercallLib

 

 #

 # The following information is for reference only and not required by the build tools.

 #

-#  VALID_ARCHITECTURES           = IA32 X64

+#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64

 #

 

-[Sources]

-  XenHypercallIntel.c

+[Sources.IA32, Sources.X64]

+  X86XenHypercall.c

 

 [Sources.IA32]

   Ia32/hypercall.nasm

@@ -36,6 +41,12 @@
 [Sources.X64]

   X64/hypercall.nasm

 

+[Sources.ARM]

+  Arm/Hypercall.S

+

+[Sources.AARCH64]

+  Aarch64/Hypercall.S

+

 [Sources]

   XenHypercall.c

 

@@ -43,10 +54,10 @@
   MdePkg/MdePkg.dec

   OvmfPkg/OvmfPkg.dec

 

-[LibraryClasses]

+[LibraryClasses.IA32, LibraryClasses.X64]

   BaseLib

   HobLib

   DebugLib

 

-[Guids]

+[Guids.IA32, Guids.X64]

   gEfiXenInfoGuid

diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercallLibArm.inf b/OvmfPkg/Library/XenHypercallLib/XenHypercallLibArm.inf
deleted file mode 100644
index 9cbbeb5d87..0000000000
--- a/OvmfPkg/Library/XenHypercallLib/XenHypercallLibArm.inf
+++ /dev/null
@@ -1,40 +0,0 @@
-## @file

-#  Xen Hypercall abstraction lib for ARM architecture

-#

-#  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>

-#  This program and the accompanying materials

-#  are licensed and made available under the terms and conditions of the BSD License

-#  which accompanies this distribution.  The full text of the license may be found at

-#  http://opensource.org/licenses/bsd-license.php

-#

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-##

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = XenHypercallLibArm

-  FILE_GUID                      = 9607AC2E-FCB9-499B-9475-612282019568

-  MODULE_TYPE                    = BASE

-  VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = XenHypercallLib

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = ARM AARCH64

-#

-

-[Sources.ARM]

-  Arm/Hypercall.S

-

-[Sources.AARCH64]

-  Aarch64/Hypercall.S

-

-[Sources]

-  XenHypercall.c

-

-[Packages]

-  MdePkg/MdePkg.dec

-  OvmfPkg/OvmfPkg.dec

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 8c88061385..1f43f7d31f 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -128,7 +128,7 @@
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf

   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf

-  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf

+  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf

 

 [LibraryClasses.common]

 !if $(SECURE_BOOT_ENABLE) == TRUE

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index ff32ecefd0..21393ebb52 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -133,7 +133,7 @@
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf

   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf

-  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf

+  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf

 

 [LibraryClasses.common]

 !if $(SECURE_BOOT_ENABLE) == TRUE

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 8bac6dc313..25a3ee52ed 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -133,7 +133,7 @@
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf

   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf

-  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLibIntel.inf

+  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf

 

 [LibraryClasses.common]

 !if $(SECURE_BOOT_ENABLE) == TRUE