Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/XenPlatformPei/Xen.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• OvmfPkg/XenPlatformPei/Xen.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/XenPlatformPei/Xen.c

@@ -129 +129 @@
   )
 {
-  UINT32             Index;
-  UINT32             TransferReg;
-  UINT32             TransferPages;
   UINT32             XenVersion;
   EFI_XEN_OVMF_INFO  *Info;
@@ -139 +136 @@
 
   ASSERT (mXenLeaf != 0);
-
-  //
-  // Prepare HyperPages to be able to make hypercalls
-  //
-
-  AsmCpuid (mXenLeaf + 2, &TransferPages, &TransferReg, NULL, NULL);
-  mXenInfo.HyperPages = AllocatePages (TransferPages);
-  if (!mXenInfo.HyperPages) {
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  for (Index = 0; Index < TransferPages; Index++) {
-    AsmWriteMsr64 (
-      TransferReg,
-      (UINTN)mXenInfo.HyperPages +
-      (Index << EFI_PAGE_SHIFT) + Index
-      );
-  }
 
   //
@@ -284 +263 @@
   // This function should only be used after XenConnect
   //
-  ASSERT (mXenInfo.HyperPages != NULL);
+  ASSERT (mXenInfo.VersionMajor);
 
   return mXenHvmloaderInfo == NULL;