Changeset 24599 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Nov 11, 2009 5:09:45 PM (15 years ago)

Author:

vboxsync

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

54735

Message:

EFI: Main work for additional firmware types and presence checks

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1592 +1592 @@
                         )
                     hw.firmwareType = FirmwareType_EFI;
+                else if (    strFirmwareType == "EFI64")
+                    hw.firmwareType = FirmwareType_EFI64;
+                else if (    strFirmwareType == "EFIDUAL")
+                    hw.firmwareType = FirmwareType_EFIDUAL;
                 else
                     throw ConfigFileError(this,
@@ -2475 +2479 @@
 
     if (    (m->sv >= SettingsVersion_v1_9)
-         && (hw.firmwareType == FirmwareType_EFI)
+         && (hw.firmwareType >= FirmwareType_EFI)
        )
     {
          xml::ElementNode *pelmFirmware = pelmHardware->createChild("Firmware");
-         pelmFirmware->setAttribute("type", "EFI");
+         const char *pcszFirmware;
+
+         switch (hw.firmwareType)
+         {
+            case FirmwareType_EFI:      pcszFirmware = "EFI";   break;
+            case FirmwareType_EFI64:    pcszFirmware = "EFI64"; break;
+            case FirmwareType_EFIDUAL:  pcszFirmware = "EFIDUAL"; break;
+            default:                    pcszFirmware = "None"; break;
+         }
+         pelmFirmware->setAttribute("type", pcszFirmware);
     }
 
@@ -2977 +2990 @@
     // all the following require settings version 1.9
     if (    (m->sv < SettingsVersion_v1_9)
-         && (    (hardwareMachine.firmwareType == FirmwareType_EFI)
+         && (    (hardwareMachine.firmwareType >= FirmwareType_EFI)
               || (hardwareMachine.fHardwareVirtExclusive != HWVIRTEXCLUSIVEDEFAULT)
               || fTeleporterEnabled