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

Timestamp:

Sep 21, 2009 11:23:12 AM (15 years ago)

Author:

vboxsync

Message:

Main: firmware type setter

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (6 diffs)
• idl/VirtualBox.xidl (modified) (3 diffs)
• include/MachineImpl.h (modified) (2 diffs)
• xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -391 +391 @@
      */
 #ifdef VBOX_WITH_EFI
-    /** @todo: implement appropriate getter */
     Bstr tmpStr1;
     hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/UseEFI"), tmpStr1.asOutParam());    H();
     BOOL fEfiEnabled = !tmpStr1.isEmpty();
+
+    /**
+     * @todo: VBoxInternal2/UseEFI extradata will go away soon, and we'll
+     *        just use this code 
+     */
+    if (!fEfiEnabled)
+    {
+      FirmwareType_T eType =  FirmwareType_Bios;
+      hrc = pMachine->COMGETTER(FirmwareType)(&eType);                                H();
+      fEfiEnabled = (eType == FirmwareType_Efi);
+    }
 #else
     BOOL fEfiEnabled = false;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -196 +196 @@
     mClipboardMode = ClipboardMode_Bidirectional;
     mGuestPropertyNotificationPatterns = "";
+    
+    mFirmwareType = FirmwareType_Bios;
 }
 
@@ -212 +214 @@
         mStatisticsUpdateInterval != that.mStatisticsUpdateInterval ||
         mVRAMSize != that.mVRAMSize ||
+        mFirmwareType != that.mFirmwareType ||
         mAccelerate3DEnabled != that.mAccelerate3DEnabled ||
         mAccelerate2DVideoEnabled != that.mAccelerate2DVideoEnabled ||
@@ -1125 +1128 @@
     mUserData.backup();
     mUserData->mOSTypeId = osTypeId;
+
+    return S_OK;
+}
+
+
+STDMETHODIMP Machine::COMGETTER(FirmwareType) (FirmwareType_T *aFirmwareType)
+{
+    CheckComArgOutPointerValid(aFirmwareType);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    *aFirmwareType = mHWData->mFirmwareType;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(FirmwareType) (FirmwareType_T aFirmwareType)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+    AutoWriteLock alock(this);
+
+    int rc = checkStateDependency(MutableStateDep);
+    CheckComRCReturnRC(rc);
+
+    mHWData.backup();
+    mHWData->mFirmwareType = aFirmwareType;
 
     return S_OK;
@@ -4928 +4961 @@
         mHWData->mAccelerate3DEnabled = data.fAccelerate3D;
         mHWData->mAccelerate2DVideoEnabled = data.fAccelerate2DVideo;
+        mHWData->mFirmwareType = data.cFirmwareType;
 
 #ifdef VBOX_WITH_VRDP
@@ -5620 +5654 @@
         mData->m_pMachineConfigFile->strDescription = mUserData->mDescription;
         mData->m_pMachineConfigFile->strOsType = mUserData->mOSTypeId;
-
+        
         if (    mData->mMachineState == MachineState_Saved
              || mData->mMachineState == MachineState_Restoring
@@ -5766 +5800 @@
         // memory
         data.ulMemorySizeMB = mHWData->mMemorySize;
+
+        // firmware
+        data.cFirmwareType = mHWData->mFirmwareType;
 
         // boot order

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

@@ -974 +974 @@
   </enum>
 
+   <enum
+    name="FirmwareType"
+    uuid="7ceea938-8b49-41e2-bb47-667219c0d586"
+  >
+    <desc>
+      Firmware type.
+    </desc>
+    <const name="Bios"            value="1">
+      <desc>BIOS Firmware.</desc>
+    </const>
+    <const name="Efi"             value="2">
+      <desc>Efi firmware.</desc>
+    </const>
+  </enum>
 
   <!--
@@ -3973 +3987 @@
   </interface>
 
+
+   
   <interface
      name="IMachine" extends="$unknown"
@@ -4196 +4212 @@
     <attribute name="BIOSSettings" type="IBIOSSettings" readonly="yes">
       <desc>Object containing all BIOS settings.</desc>
+    </attribute>
+
+     <attribute name="firmwareType" type="FirmwareType">
+      <desc>Type of firmware (such as legacy BIOS or EFI), used for initial 
+       bootstrap in this VM.</desc>
     </attribute>
 

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

@@ -301 +301 @@
         BOOL           mPropertyServiceActive;
         Bstr           mGuestPropertyNotificationPatterns;
+
+        FirmwareType_T mFirmwareType; 
     };
 
@@ -601 +603 @@
     STDMETHOD(RemoveStorageController (IN_BSTR aName));
     STDMETHOD(GetStorageControllerByName (IN_BSTR aName, IStorageController **storageController));
+    STDMETHOD(COMGETTER(FirmwareType)) (FirmwareType_T *aFirmware);
+    STDMETHOD(COMSETTER(FirmwareType)) (FirmwareType_T  aFirmware);
 
     // public methods only for internal purposes

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

@@ -954 +954 @@
           fAccelerate3D(false),
           fAccelerate2DVideo(false),
+          cFirmwareType(FirmwareType_Bios),
           clipboardMode(ClipboardMode_Bidirectional),
           ulMemoryBalloonSize(0),
@@ -1203 +1204 @@
         else if (pelmHwChild->nameEquals("Memory"))
             pelmHwChild->getAttributeValue("RAMSize", hw.ulMemorySizeMB);
+        else if (pelmHwChild->nameEquals("Firmware"))
+            pelmHwChild->getAttributeValue("type", hw.cFirmwareType);
         else if (pelmHwChild->nameEquals("Boot"))
         {
@@ -1833 +1836 @@
     pelmMemory->setAttribute("RAMSize", hw.ulMemorySizeMB);
 
+    if (m->sv >= SettingsVersion_v1_8)
+    {
+         xml::ElementNode *pelmFirmware = pelmHardware->createChild("Firmware");
+         pelmFirmware->setAttribute("type", hw.cFirmwareType);
+    }
+
     xml::ElementNode *pelmBoot = pelmHardware->createChild("Boot");
     for (BootOrderMap::const_iterator it = hw.mapBootOrder.begin();