mirror of https://github.com/acidanthera/audk.git
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>
This commit is contained in:
parent
3361336607
commit
406ad0582a
OvmfPkg
|
@ -1709,7 +1709,7 @@ FreeFwCfg:
|
||||||
Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate
|
Attempt to retrieve the "bootorder" fw_cfg file from QEMU. Translate
|
||||||
the OpenFirmware device paths therein to UEFI device path fragments.
|
the OpenFirmware device paths therein to UEFI device path fragments.
|
||||||
|
|
||||||
On Success store the device path in QemuBootOrderNNNN variables.
|
On Success store the device path in VMMBootOrderNNNN variables.
|
||||||
**/
|
**/
|
||||||
VOID
|
VOID
|
||||||
EFIAPI
|
EFIAPI
|
||||||
|
@ -1794,13 +1794,13 @@ StoreQemuBootOrder (
|
||||||
UnicodeSPrint (
|
UnicodeSPrint (
|
||||||
VariableName,
|
VariableName,
|
||||||
sizeof (VariableName),
|
sizeof (VariableName),
|
||||||
L"QemuBootOrder%04d",
|
L"VMMBootOrder%04x",
|
||||||
VariableIndex++
|
VariableIndex++
|
||||||
);
|
);
|
||||||
DEBUG ((DEBUG_INFO, "%a: %s = %s\n", __FUNCTION__, VariableName, Translated));
|
DEBUG ((DEBUG_INFO, "%a: %s = %s\n", __FUNCTION__, VariableName, Translated));
|
||||||
gRT->SetVariable (
|
gRT->SetVariable (
|
||||||
VariableName,
|
VariableName,
|
||||||
&gQemuBootOrderGuid,
|
&gVMMBootOrderGuid,
|
||||||
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
|
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
|
||||||
GetDevicePathSize (DevicePath),
|
GetDevicePathSize (DevicePath),
|
||||||
DevicePath
|
DevicePath
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
[Guids]
|
[Guids]
|
||||||
gEfiGlobalVariableGuid
|
gEfiGlobalVariableGuid
|
||||||
gVirtioMmioTransportGuid
|
gVirtioMmioTransportGuid
|
||||||
gQemuBootOrderGuid
|
gVMMBootOrderGuid
|
||||||
|
|
||||||
[FeaturePcd]
|
[FeaturePcd]
|
||||||
gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation
|
gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation
|
||||||
|
|
|
@ -146,7 +146,7 @@
|
||||||
gConfidentialComputingSecretGuid = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}}
|
gConfidentialComputingSecretGuid = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}}
|
||||||
gConfidentialComputingSevSnpBlobGuid = {0x067b1f5f, 0xcf26, 0x44c5, {0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42}}
|
gConfidentialComputingSevSnpBlobGuid = {0x067b1f5f, 0xcf26, 0x44c5, {0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42}}
|
||||||
gUefiOvmfPkgPlatformInfoGuid = {0xdec9b486, 0x1f16, 0x47c7, {0x8f, 0x68, 0xdf, 0x1a, 0x41, 0x88, 0x8b, 0xa5}}
|
gUefiOvmfPkgPlatformInfoGuid = {0xdec9b486, 0x1f16, 0x47c7, {0x8f, 0x68, 0xdf, 0x1a, 0x41, 0x88, 0x8b, 0xa5}}
|
||||||
gQemuBootOrderGuid = {0x668f4529, 0x63d0, 0x4bb5, {0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}}
|
gVMMBootOrderGuid = {0x668f4529, 0x63d0, 0x4bb5, {0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}}
|
||||||
|
|
||||||
[Ppis]
|
[Ppis]
|
||||||
# PPI whose presence in the PPI database signals that the TPM base address
|
# PPI whose presence in the PPI database signals that the TPM base address
|
||||||
|
|
Loading…
Reference in New Issue