Changeset 96816 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 21, 2022 5:15:14 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10293: Extend Details pane with Secure Boot info which doesn't work for now cause of API limitations.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (3 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• globals/UIDetailsGenerator.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -1069 +1069 @@
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_TpmType:         strResult = QApplication::translate("UICommon", "TPM Type"); break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Firmware:        strResult = QApplication::translate("UICommon", "Firmware"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_SecureBoot:      strResult = QApplication::translate("UICommon", "Secure Boot"); break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Acceleration:    strResult = QApplication::translate("UICommon", "Acceleration"); break;
         default:
@@ -1092 +1093 @@
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_TpmType:         strResult = "TPMType"; break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Firmware:        strResult = "Firmware"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_SecureBoot:      strResult = "SecureBoot"; break;
         case UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Acceleration:    strResult = "Acceleration"; break;
         default:
@@ -1120 +1122 @@
     if (strDetailsElementOptionTypeSystem.compare("Firmware", Qt::CaseInsensitive) == 0)
         return UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Firmware;
+    if (strDetailsElementOptionTypeSystem.compare("SecureBoot", Qt::CaseInsensitive) == 0)
+        return UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_SecureBoot;
     if (strDetailsElementOptionTypeSystem.compare("Acceleration", Qt::CaseInsensitive) == 0)
         return UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Acceleration;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -719 +719 @@
         DetailsElementOptionTypeSystem_TpmType         = RT_BIT(5),
         DetailsElementOptionTypeSystem_Firmware        = RT_BIT(6),
-        DetailsElementOptionTypeSystem_Acceleration    = RT_BIT(7),
+        DetailsElementOptionTypeSystem_SecureBoot      = RT_BIT(7),
+        DetailsElementOptionTypeSystem_Acceleration    = RT_BIT(8),
         DetailsElementOptionTypeSystem_Default         = 0xFFFF
     };

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -52 +52 @@
 #include "CMediumAttachment.h"
 #include "CNetworkAdapter.h"
+#include "CNvramStore.h"
 #include "CProgress.h"
 #include "CRangedIntegerFormValue.h"
@@ -62 +63 @@
 #include "CSystemProperties.h"
 #include "CTrustedPlatformModule.h"
+#include "CUefiVariableStore.h"
 #include "CUSBController.h"
 #include "CUSBDeviceFilter.h"
@@ -333 +335 @@
                 QApplication::translate("UIDetails", "Disabled", "details (system/EFI)");
                 break;
+            }
+        }
+    }
+
+    /* Secure Boot: */
+    if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_SecureBoot)
+    {
+        CNvramStore comStoreLvl1 = comMachine.GetNonVolatileStore();
+        if (comStoreLvl1.isNotNull())
+        {
+            CUefiVariableStore comStoreLvl2 = comStoreLvl1.GetUefiVariableStore();
+            /// @todo this comStoreLvl2.isNotNull() will never work for
+            ///       now since VM reference is immutable in Details pane
+            if (   comStoreLvl2.isNotNull()
+                && comStoreLvl2.GetSecureBootEnabled())
+            {
+                table << UITextTableLine(QApplication::translate("UIDetails", "Secure Boot", "details (system)"),
+                                         QApplication::translate("UIDetails", "Enabled", "details (system/secure boot)"));
             }
         }