1 files changed, 6 insertions, 0 deletions
diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
index c7c3fcb36f..7a8beb3354 100644
--- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
+++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
@@ -819,6 +819,12 @@ FvbInitialize (
     return EFI_INVALID_PARAMETER;
   }
 
+  if (PcdGet64 (PcdFlashNvStorageVariableBase64) != 0) {
+    DEBUG ((EFI_D_INFO, "Disabling EMU Variable FVB since "
+                        "flash variables appear to be supported.\n"));
+    return EFI_ABORTED;
+  }
+
   //
   // By default we will initialize the FV contents.  But, if
   // PcdEmuVariableNvStoreReserved is non-zero, then we will