OvmfPkg/Virtio: take RingBaseShift in SetQueueAddress()

[mirror_edk2.git] / OvmfPkg / Library / LockBoxLib / LockBoxLib.c

diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
index af3bb7f46deff2f0d751bc4e18051a0a040cf03f..45481b9230d2c16de4dfdf616b949b6f368e4dbd 100644 (file)
--- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
+++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
@@ -44,6 +44,8 @@ LockBoxLibInitialize (
 {\r
   UINTN NumEntries;\r
 \r
+  ASSERT (!FeaturePcdGet (PcdSmmSmramRequire));\r
+\r
   if (PcdGet32 (PcdOvmfLockBoxStorageSize) < sizeof (LOCK_BOX_GLOBAL)) {\r
     return RETURN_UNSUPPORTED;\r
   }\r
@@ -369,7 +371,7 @@ RestoreAllLockBoxInPlace (
       Buffer = (VOID *)(UINTN) Header->OrigAddress;\r
       CopyMem (Buffer, (VOID*)(UINTN)Header->CopyAddress, Header->Size);\r
       DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p\n", __FUNCTION__,\r
-        Header->Guid, Buffer));\r
+        &Header->Guid, Buffer));\r
     }\r
   }\r
   return RETURN_SUCCESS;\r