Changeset 81262 in vbox

Timestamp:

Oct 14, 2019 4:42:45 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133957

Message:

Devices/EFI: Don't fail if there is no NVRAM driver attached below

File:

• trunk/src/VBox/Devices/EFI/DevEFI.cpp (modified) (1 diff)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -2294 +2294 @@
 
     rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->Lun0.IBase, &pThis->Lun0.pDrvBase, "NvramStorage");
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+    {
+        pThis->Lun0.pNvramDrv = PDMIBASE_QUERY_INTERFACE(pThis->Lun0.pDrvBase, PDMINVRAMCONNECTOR);
+        AssertPtrReturn(pThis->Lun0.pNvramDrv, VERR_PDM_MISSING_INTERFACE_BELOW);
+
+        rc = nvramLoad(pThis);
+        AssertRCReturn(rc, rc);
+    }
+    if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    {
+        pThis->Lun0.pNvramDrv = NULL;
+        rc = VINF_SUCCESS; /* Missing driver is no error condition. */
+    }
+    else
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS, N_("Can't attach Nvram Storage driver"));
-
-    pThis->Lun0.pNvramDrv = PDMIBASE_QUERY_INTERFACE(pThis->Lun0.pDrvBase, PDMINVRAMCONNECTOR);
-    AssertPtrReturn(pThis->Lun0.pNvramDrv, VERR_PDM_MISSING_INTERFACE_BELOW);
-
-    rc = nvramLoad(pThis);
-    AssertRCReturn(rc, rc);
 
     /*