Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

OvmfPkg/AcpiPlatformDxe: Refactor QemuAcpiTableNotifyProtocol 

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4237

Commit 9fdc70af6b install the QemuAcpiTableNotifyProtocol at a
wrong positioin. It should be called before TransferS3ContextToBootScript
because TransferS3ContextToBootScript is the last operation in
InstallQemuFwCfgTables(). Another error is that we should check the
returned value after installing the QemuAcpiTableNotifyProtocol.

This patch refactors the installation and error handling of
QemuAcpiTableNotifyProtocol in InstallQemuFwCfgTables ().

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>
Message-Id: <20230111012235.189-6-min.m.xu@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Min M Xu 2023-01-11 09:22:34 +08:00 committed by mergify[bot]
parent 2ef0ff39e5
commit 66f18fde49
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
View File

@ -1247,6 +1247,21 @@ InstallQemuFwCfgTables (
}
}
//
// Install a protocol to notify that the ACPI table provided by Qemu is
// ready.
//
QemuAcpiHandle = NULL;
Status = gBS->InstallProtocolInterface (
&QemuAcpiHandle,
&gQemuAcpiTableNotifyProtocolGuid,
EFI_NATIVE_INTERFACE,
NULL
);
if (EFI_ERROR (Status)) {
goto UninstallAcpiTables;
}
//
// Translating the condensed QEMU_LOADER_WRITE_POINTER commands to ACPI S3
// Boot Script opcodes has to be the last operation in this function, because
@ -1255,7 +1270,7 @@ InstallQemuFwCfgTables (
if (S3Context != NULL) {
Status = TransferS3ContextToBootScript (S3Context);
if (EFI_ERROR (Status)) {
goto UninstallAcpiTables;
goto UninstallQemuAcpiTableNotifyProtocol;
}
//
@ -1266,6 +1281,15 @@ InstallQemuFwCfgTables (
DEBUG ((DEBUG_INFO, "%a: installed %d tables\n", __FUNCTION__, Installed));
UninstallQemuAcpiTableNotifyProtocol:
if (EFI_ERROR (Status)) {
gBS->UninstallProtocolInterface (
QemuAcpiHandle,
&gQemuAcpiTableNotifyProtocolGuid,
NULL
);
}
UninstallAcpiTables:
if (EFI_ERROR (Status)) {
//
@ -1275,18 +1299,6 @@ UninstallAcpiTables:
--Installed;
AcpiProtocol->UninstallAcpiTable (AcpiProtocol, InstalledKey[Installed]);
}
} else {
//
// Install a protocol to notify that the ACPI table provided by Qemu is
// ready.
//
QemuAcpiHandle = NULL;
gBS->InstallProtocolInterface (
&QemuAcpiHandle,
&gQemuAcpiTableNotifyProtocolGuid,
EFI_NATIVE_INTERFACE,
NULL
);
}
for (SeenPointerEntry = OrderedCollectionMin (SeenPointers);