OvmfPkg/QemuVideoDxe/VbeShim: rename Status to Segment0AllocationStatus

This clarifies the purpose of the local variable in InstallVbeShim().

Cc: Aleksei Kovura <alex3kov@zoho.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Ref: https://bugs.launchpad.net/qemu/+bug/1715700
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Aleksei Kovura <alex3kov@zoho.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.c b/OvmfPkg/QemuVideoDxe/VbeShim.c
index 4c4517e9da27556c8dde6612a2aa39904ae79ba0..bc90e067266de5e867764a93ed4f6ab9175b6827 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/VbeShim.c
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.c
@@ -63,7 +63,7 @@ InstallVbeShim (
   EFI_PHYSICAL_ADDRESS Segment0, SegmentC, SegmentF;\r
   UINTN                Segment0Pages;\r
   IVT_ENTRY            *Int0x10;\r
-  EFI_STATUS           Status;\r
+  EFI_STATUS           Segment0AllocationStatus;\r
   UINTN                Pam1Address;\r
   UINT8                Pam1;\r
   UINTN                SegmentCPages;\r
@@ -87,10 +87,14 @@ InstallVbeShim (
   //\r
   Segment0Pages = 1;\r
   Int0x10       = (IVT_ENTRY *)(UINTN)Segment0 + 0x10;\r
-  Status = gBS->AllocatePages (AllocateAddress, EfiBootServicesCode,\r
-                  Segment0Pages, &Segment0);\r
-\r
-  if (EFI_ERROR (Status)) {\r
+  Segment0AllocationStatus = gBS->AllocatePages (\r
+                                    AllocateAddress,\r
+                                    EfiBootServicesCode,\r
+                                    Segment0Pages,\r
+                                    &Segment0\r
+                                    );\r
+\r
+  if (EFI_ERROR (Segment0AllocationStatus)) {\r
     EFI_PHYSICAL_ADDRESS Handler;\r
 \r
     //\r
@@ -109,8 +113,12 @@ InstallVbeShim (
     // Otherwise we'll overwrite the Int10h vector, even though we may not own\r
     // the page at zero.\r
     //\r
-    DEBUG ((EFI_D_INFO, "%a: failed to allocate page at zero: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: failed to allocate page at zero: %r\n",\r
+      __FUNCTION__,\r
+      Segment0AllocationStatus\r
+      ));\r
   } else {\r
     //\r
     // We managed to allocate the page at zero. SVN r14218 guarantees that it\r