Changeset 24599 in vbox

Timestamp:

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

Author:

vboxsync

Message:

EFI: Main work for additional firmware types and presence checks

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• Main/VirtualBoxImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/VirtualBoxImpl.h (modified) (1 diff)
• Main/xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -302 +302 @@
             case MODIFYVM_FIRMWARE:
             {
-                if (!strcmp(ValueUnion.psz, "efi"))
+                if (!strcmp(ValueUnion.psz, "efi") || !strcmp(ValueUnion.psz, "efi32"))
                 {
                     CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_EFI));
+                }
+                else if (!strcmp(ValueUnion.psz, "efi64"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_EFI64));
+                }
+                else if (!strcmp(ValueUnion.psz, "efidual"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_EFIDUAL));
                 }
                 else if (!strcmp(ValueUnion.psz, "bios"))

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -930 +930 @@
 }
 
+
+
+STDMETHODIMP
+VirtualBox::CheckFirmwarePresent(FirmwareType_T aFirmwareType, 
+                                 IN_BSTR        aVersion, 
+                                 BSTR           *aUrl, 
+                                 BOOL           *aResult)
+{
+    ReturnComNotImplemented();
+}
 // IVirtualBox methods
 /////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1107 +1107 @@
     </const>
     <const name="EFI"             value="2">
-      <desc>Efi firmware.</desc>
+      <desc>Efi firmware, 32-bit.</desc>
+    </const>
+    <const name="EFI64"           value="3">
+      <desc>Efi firmware, 64-bit.</desc>
+    </const>
+    <const name="EFIDUAL"         value="4">
+      <desc>Efi firmware, combined 32 and 64-bit.</desc>
     </const>
   </enum>
@@ -3000 +3006 @@
       <param name="server" type="IDHCPServer" dir="in">
         <desc>Dhcp server settings to be removed</desc>
+      </param>
+    </method>
+
+
+    <method name="checkFirmwarePresent">
+      <desc>
+        Check if this VirtualBox installation have firmware
+        of given type available, either system-wide, or per-user.
+        Optionally, may return a hint where this firmware can be
+        downloaded from.
+      </desc>
+      <param name="firmwareType" type="FirmwareType" dir="in">
+        <desc>
+          Type of firmware to check.
+        </desc>
+      </param>
+      <param name="version" type="wstring" dir="in">
+        <desc>Expected version number, usually empty string.</desc>
+      </param>
+
+      <param name="url" type="wstring" dir="out">
+        <desc>
+          Suggested url to download this firmware from.
+        </desc>
+      </param>
+      <param name="result" type="boolean" dir="return">
+        <desc>If firmware of this type and version is available.</desc>
       </param>
     </method>

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

@@ -177 +177 @@
     STDMETHOD(FindDHCPServerByNetworkName) (IN_BSTR aName, IDHCPServer ** aServer);
     STDMETHOD(RemoveDHCPServer) (IDHCPServer * aServer);
+    STDMETHOD(CheckFirmwarePresent)(FirmwareType_T aFirmwareType, IN_BSTR aVersion, 
+                                    BSTR * aUrl, BOOL * aResult);
 
     /* public methods only for internal purposes */

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