Changeset 103532 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 22, 2024 2:05:31 PM (9 months ago)

Author:

vboxsync

Message:

VBoxManage: Add subcommand for enabling UEFI secure boot (and show the status in the VM infos).
Main/NVRAMStore+UefiVariableStore: Tweaks to allow reading the UEFI secure boot state when the VM isn't mutable.
doc/manual: Update VBoxManage manpage.

Location:

trunk/src/VBox/Main

Files:

• include/AutoStateDep.h (modified) (3 diffs)
• src-all/NvramStoreImpl.cpp (modified) (3 diffs)
• src-server/UefiVariableStoreImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/AutoStateDep.h

@@ -73 +73 @@
               mRegistered(FALSE)
         {
-            Assert(aThat);
-            mRC = aThat->i_addStateDependency(taDepType, &mMachineState,
-                                            &mRegistered);
+            if (RT_VALID_PTR(aThat))
+                mRC = aThat->i_addStateDependency(taDepType, &mMachineState,
+                                                  &mRegistered);
         }
         ~AutoStateDependency()
         {
-            if (SUCCEEDED(mRC))
+            if (RT_VALID_PTR(mThat) && SUCCEEDED(mRC))
                 mThat->i_releaseStateDependency();
         }
@@ -88 +88 @@
         {
             AssertReturnVoid(SUCCEEDED(mRC));
-            mThat->i_releaseStateDependency();
+            if (RT_VALID_PTR(mThat))
+                mThat->i_releaseStateDependency();
             mRC = E_FAIL;
         }
@@ -98 +99 @@
         {
             AssertReturnVoid(!SUCCEEDED(mRC));
-            mRC = mThat->i_addStateDependency(taDepType, &mMachineState,
-                                            &mRegistered);
+            if (RT_VALID_PTR(mThat))
+                mRC = mThat->i_addStateDependency(taDepType, &mMachineState,
+                                                  &mRegistered);
+            else
+                mRC = S_OK;
         }
 

trunk/src/VBox/Main/src-all/NvramStoreImpl.cpp

@@ -380 +380 @@
 {
 #ifndef VBOX_COM_INPROC
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pParent);
-    if (FAILED(adep.hrc())) return adep.hrc();
-
     Utf8Str strPath;
     NvramStore::getNonVolatileStorageFile(strPath);
@@ -418 +414 @@
     {
         m->pUefiVarStore.queryInterfaceTo(aUefiVarStore.asOutParam());
-
-        /* Mark the NVRAM store as potentially modified. */
-        m->pParent->i_setModified(Machine::IsModified_NvramStore);
+        /* The "modified" state is handled by i_retainUefiVarStore. */
     }
 
@@ -1066 +1060 @@
 HRESULT NvramStore::i_retainUefiVarStore(PRTVFS phVfs, bool fReadonly)
 {
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pParent);
+    /* the machine needs to be mutable unless fReadonly is set */
+    AutoMutableStateDependency adep(fReadonly ? NULL : m->pParent);
     if (FAILED(adep.hrc())) return adep.hrc();
 

trunk/src/VBox/Main/src-server/UefiVariableStoreImpl.cpp

@@ -152 +152 @@
 HRESULT UefiVariableStore::getSecureBootEnabled(BOOL *pfEnabled)
 {
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pMachine);
-    if (FAILED(adep.hrc())) return adep.hrc();
-
     HRESULT hrc = i_retainUefiVariableStore(true /*fReadonly*/);
     if (FAILED(hrc)) return hrc;
@@ -324 +320 @@
                                                std::vector<BYTE> &aData)
 {
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pMachine);
-    if (FAILED(adep.hrc())) return adep.hrc();
-
     HRESULT hrc = i_retainUefiVariableStore(true /*fReadonly*/);
     if (FAILED(hrc)) return hrc;
@@ -370 +362 @@
                                           std::vector<com::Guid> &aOwnerUuids)
 {
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pMachine);
-    if (FAILED(adep.hrc())) return adep.hrc();
-
     HRESULT hrc = i_retainUefiVariableStore(true /*fReadonly*/);
     if (FAILED(hrc)) return hrc;
@@ -522 +510 @@
 HRESULT UefiVariableStore::enrollDefaultMsSignatures(void)
 {
+    /* the machine needs to be mutable */
     AutoMutableStateDependency adep(m->pMachine);
     if (FAILED(adep.hrc())) return adep.hrc();