OvmfPkg: rename QemuBootOrderNNNN to VMMBootOrderNNNN

While the actual implementation (using qemu fw_cfg) is qemu-specific,
the idea to store the boot order as configured by the VMM in EFI
variables is not.  So lets give the variables a more neutral name while
we still can (i.e. no stable tag yet with the new feature).

While being at it also fix the NNNN format (use %x instead of %d for
consistency with BootNNNN).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
index 18646daa67e3247403628bba0774d3025736f53b..cea4b7a099e317ee4e0db1febdd5910b0dd05c36 100644 (file)
--- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
+++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
@@ -1709,7 +1709,7 @@ FreeFwCfg:
   Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate\r
   the OpenFirmware device paths therein to UEFI device path fragments.\r
 \r
-  On Success store the device path in QemuBootOrderNNNN variables.\r
+  On Success store the device path in VMMBootOrderNNNN variables.\r
 **/\r
 VOID\r
 EFIAPI\r
@@ -1794,13 +1794,13 @@ StoreQemuBootOrder (
       UnicodeSPrint (\r
         VariableName,\r
         sizeof (VariableName),\r
-        L"QemuBootOrder%04d",\r
+        L"VMMBootOrder%04x",\r
         VariableIndex++\r
         );\r
       DEBUG ((DEBUG_INFO, "%a: %s = %s\n", __FUNCTION__, VariableName, Translated));\r
       gRT->SetVariable (\r
              VariableName,\r
-             &gQemuBootOrderGuid,\r
+             &gVMMBootOrderGuid,\r
              EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
              GetDevicePathSize (DevicePath),\r
              DevicePath\r

diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
index 211344fb0b8927f282ae6d4f2a9d6b5ab27165b0..6e320e3e85147abdc25288ec92c3c01f78e885a4 100644 (file)
--- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
+++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
@@ -49,7 +49,7 @@
 [Guids]\r
   gEfiGlobalVariableGuid\r
   gVirtioMmioTransportGuid\r
-  gQemuBootOrderGuid\r
+  gVMMBootOrderGuid\r
 \r
 [FeaturePcd]\r
   gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation\r

diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index 6d689ecc5d5596a4f43b22cd8b980ad0c7973e66..f13dd4a61f017a4dbf1590e6d6498fd3dfda0cb7 100644 (file)
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -146,7 +146,7 @@
   gConfidentialComputingSecretGuid      = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}}\r
   gConfidentialComputingSevSnpBlobGuid  = {0x067b1f5f, 0xcf26, 0x44c5, {0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42}}\r
   gUefiOvmfPkgPlatformInfoGuid          = {0xdec9b486, 0x1f16, 0x47c7, {0x8f, 0x68, 0xdf, 0x1a, 0x41, 0x88, 0x8b, 0xa5}}\r
-  gQemuBootOrderGuid                    = {0x668f4529, 0x63d0, 0x4bb5, {0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}}\r
+  gVMMBootOrderGuid                     = {0x668f4529, 0x63d0, 0x4bb5, {0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}}\r
 \r
 [Ppis]\r
   # PPI whose presence in the PPI database signals that the TPM base address\r