Changeset 34010 in vbox

Timestamp:

Nov 11, 2010 8:17:47 PM (14 years ago)

Author:

vboxsync

Message:

Main, FE/VBoxManage: Make it possible to mark specific controllers as bootable which means that the BIOS can access devices attached to the controller to boot from it

Location:

trunk

Files:

• include/VBox/settings.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (modified) (4 diffs)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (5 diffs)
• src/VBox/Main/MachineImpl.cpp (modified) (5 diffs)
• src/VBox/Main/StorageControllerImpl.cpp (modified) (7 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (4 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (1 diff)
• src/VBox/Main/include/StorageControllerImpl.h (modified) (3 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

trunk/include/VBox/settings.h

@@ -797 +797 @@
           ulInstance(0),
           fUseHostIOCache(true),
+          fBootable(true),
           lIDE0MasterEmulationPort(0),
           lIDE0SlaveEmulationPort(0),
@@ -811 +812 @@
     uint32_t                ulInstance;
     bool                    fUseHostIOCache;
+    bool                    fBootable;
 
     // only for when controllerType == StorageControllerType_IntelAhci:

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

@@ -478 +478 @@
                      "                            [--sataportcount <1-30>]\n"
                      "                            [--hostiocache on|off]\n"
+                     "                            [--bootable on|off]\n"
                      "                            [--remove]\n"
                      "\n");

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

@@ -666 +666 @@
         const char *pszCtl = NULL;
         ULONG ulValue = 0;
+        BOOL  fBootable = FALSE;
         Bstr storageCtlName;
 
@@ -724 +725 @@
         else
             RTPrintf("Storage Controller Port Count (%u):      %lu\n", i, ulValue);
+
+        storageCtl->COMGETTER(Bootable)(&fBootable);
+        if (details == VMINFO_MACHINEREADABLE)
+            RTPrintf("storagecontrollerbootable%u=\"%s\"\n", i, fBootable ? "on" : "off");
+        else
+            RTPrintf("Storage Controller Bootable (%u):        %s\n", i, fBootable ? "on" : "off");
     }
 

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

@@ -647 +647 @@
     { "--remove",           'r', RTGETOPT_REQ_NOTHING },
     { "--hostiocache",      'i', RTGETOPT_REQ_STRING },
+    { "--bootable",         'b', RTGETOPT_REQ_STRING },
 };
 
@@ -657 +658 @@
     const char       *pszCtlType     = NULL;
     const char       *pszHostIOCache = NULL;
+    const char       *pszBootable    = NULL;
     ULONG             satabootdev    = ~0U;
     ULONG             sataidedev     = ~0U;
@@ -728 +730 @@
             }
 
+            case 'b':
+            {
+                pszBootable = ValueUnion.psz;
+                break;
+            }
+
             default:
             {
@@ -949 +957 @@
             }
         }
+
+        if (   pszBootable
+            && SUCCEEDED(rc))
+        {
+            if (SUCCEEDED(rc))
+            {
+                if (!RTStrICmp(pszBootable, "on"))
+                {
+                    CHECK_ERROR(machine, SetStorageControllerBootable(Bstr(pszCtl).raw(), TRUE));
+                }
+                else if (!RTStrICmp(pszBootable, "off"))
+                {
+                    CHECK_ERROR(machine, SetStorageControllerBootable(Bstr(pszCtl).raw(), FALSE));
+                }
+                else
+                {
+                    errorArgument("Invalid --bootable argument '%s'", pszHostIOCache);
+                    rc = E_FAIL;
+                }
+            }
+            else
+            {
+                errorArgument("Couldn't find the controller with the name: '%s'\n", pszCtl);
+                rc = E_FAIL;
+            }
+        }
     }
 

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1281 +1281 @@
             rc = ctrls[i]->COMGETTER(UseHostIOCache)(&fUseHostIOCache);                     H();
 
+            BOOL fBootable;
+            rc = ctrls[i]->COMGETTER(Bootable)(&fBootable);                                 H();
+
             /* /Devices/<ctrldev>/ */
             const char *pszCtrlDev = pConsole->convertControllerTypeToDev(enmCtrlType);
@@ -1304 +1307 @@
                     hrc = BusMgr->assignPciDevice("lsilogic", pCtlInst);                               H();
 
+                    InsertConfigInteger(pCfg, "Bootable",  fBootable);
 
                     /* Attach the status driver */
@@ -1321 +1325 @@
                     hrc = BusMgr->assignPciDevice("buslogic", pCtlInst);                               H();
 
+                    InsertConfigInteger(pCfg, "Bootable",  fBootable);
+
                     /* Attach the status driver */
                     InsertConfigNode(pCtlInst, "LUN#999", &pLunL0);
@@ -1340 +1346 @@
                     hrc = ctrls[i]->COMGETTER(PortCount)(&cPorts);                          H();
                     InsertConfigInteger(pCfg, "PortCount", cPorts);
+                    InsertConfigInteger(pCfg, "Bootable",  fBootable);
 
                     /* Needed configuration values for the bios, only first controller. */
@@ -1431 +1438 @@
 
                     InsertConfigString(pCfg,  "ControllerType", "SAS1068");
+                    InsertConfigInteger(pCfg, "Bootable",  fBootable);
 
                     /* Attach the status driver */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -5136 +5136 @@
     /* get a new instance number for the storage controller */
     ULONG ulInstance = 0;
+    bool fBootable = true;
     for (StorageControllerList::const_iterator it = mStorageControllers->begin();
          it != mStorageControllers->end();
@@ -5146 +5147 @@
             if (ulCurInst >= ulInstance)
                 ulInstance = ulCurInst + 1;
-        }
-    }
-
-    rc = ctrl->init(this, aName, aConnectionType, ulInstance);
+
+            /* Only one controller of each type can be marked as bootable. */
+            if ((*it)->getBootable())
+                fBootable = false;
+        }
+    }
+
+    rc = ctrl->init(this, aName, aConnectionType, ulInstance, fBootable);
     if (FAILED(rc)) return rc;
 
@@ -5206 +5211 @@
                     tr("Could not find a storage controller with instance number '%lu'"),
                     aInstance);
+}
+
+STDMETHODIMP Machine::SetStorageControllerBootable(IN_BSTR aName, BOOL fBootable)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
+
+    ComObjPtr<StorageController> ctrl;
+
+    rc = getStorageControllerByName(aName, ctrl, true /* aSetError */);
+    if (SUCCEEDED(rc))
+    {
+        /* Check that only one controller of each type is marked as bootable. */
+        if (fBootable == TRUE)
+        {
+            for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+                 it != mStorageControllers->end();
+                 ++it)
+            {
+                ComObjPtr<StorageController> aCtrl = (*it);
+
+                if (   (aCtrl->getName() != Utf8Str(aName))
+                    && aCtrl->getBootable() == TRUE
+                    && aCtrl->getStorageBus() == ctrl->getStorageBus()
+                    && aCtrl->getControllerType() == ctrl->getControllerType())
+                {
+                    rc = setError(VBOX_E_OBJECT_IN_USE,
+                                  tr("Another storage controller '%s' is already marked as bootable"),
+                                  aCtrl->getName().c_str());
+                    break;
+                }
+            }
+        }
+
+        if (SUCCEEDED(rc))
+        {
+            ctrl->setBootable(fBootable);
+            setModified(IsModified_Storage);
+        }
+    }
+
+    if (SUCCEEDED(rc))
+    {
+        /* inform the direct session if any */
+        alock.leave();
+        onStorageControllerChange();
+    }
+
+    return rc;
 }
 
@@ -7235 +7294 @@
                         ctlData.strName,
                         ctlData.storageBus,
-                        ctlData.ulInstance);
+                        ctlData.ulInstance,
+                        ctlData.fBootable);
         if (FAILED(rc)) return rc;
 
@@ -8267 +8327 @@
         ctl.storageBus = pCtl->getStorageBus();
         ctl.ulInstance = pCtl->getInstance();
+        ctl.fBootable = pCtl->getBootable();
 
         /* Save the port count. */

trunk/src/VBox/Main/StorageControllerImpl.cpp

@@ -47 +47 @@
           mPortCount(2),
           fUseHostIOCache(true),
+          fBootable(false),
           mPortIde0Master(0),
           mPortIde0Slave(1),
@@ -65 +66 @@
     /** Whether to use the host IO caches. */
     BOOL fUseHostIOCache;
+    /** Whether it is possible to boot from disks attached to this controller. */
+    BOOL fBootable;
 
     /** The following is only for the SATA controller atm. */
@@ -124 +127 @@
                                 const Utf8Str &aName,
                                 StorageBus_T aStorageBus,
-                                ULONG aInstance)
+                                ULONG aInstance, bool fBootable)
 {
     LogFlowThisFunc(("aParent=%p aName=\"%s\" aInstance=%u\n",
@@ -159 +162 @@
     m->bd->strName = aName;
     m->bd->mInstance = aInstance;
+    m->bd->fBootable = fBootable;
     m->bd->mStorageBus = aStorageBus;
     if (   aStorageBus != StorageBus_IDE
@@ -622 +626 @@
 }
 
+STDMETHODIMP StorageController::COMGETTER(Bootable) (BOOL *fBootable)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* The machine doesn't need to be mutable. */
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *fBootable = m->bd->fBootable;
+
+    return S_OK;
+}
+
 // IStorageController methods
 /////////////////////////////////////////////////////////////////////////////
@@ -721 +739 @@
 {
     return m->bd->mInstance;
+}
+
+bool StorageController::getBootable() const
+{
+    return !!m->bd->fBootable;
 }
 
@@ -754 +777 @@
 
 /** @note Locks objects for writing! */
+void StorageController::setBootable(BOOL fBootable)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnVoid(autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    m->bd.backup();
+    m->bd->fBootable = fBootable;
+}
+
+/** @note Locks objects for writing! */
 void StorageController::rollback()
 {

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

@@ -3419 +3419 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="cc4fec9a-3150-45df-9ee9-f00ba54d6ac3"
+     uuid="7c05b1c3-c325-46cd-820d-47648d13b7f2"
      wsmap="managed"
      >
@@ -4645 +4645 @@
       </desc>
       <param name="name" type="wstring" dir="in"/>
+    </method>
+
+    <method name="setStorageControllerBootable">
+      <desc>
+        Sets the bootable flag of the storage controller with the given name.
+
+        <result name="VBOX_E_OBJECT_NOT_FOUND">
+          A storage controller with given name doesn't exist.
+        </result>
+        <result name="VBOX_E_OBJECT_IN_USE">
+          Another storage controller is marked as bootable already.
+        </result>
+      </desc>
+      <param name="name" type="wstring" dir="in"/>
+      <param name="bootable" type="boolean" dir="in"/>
     </method>
 
@@ -13272 +13287 @@
   <interface
     name="IStorageController" extends="$unknown"
-    uuid="fd93adc0-bbaa-4256-9e6e-00e29f9151c9"
+    uuid="1556333-09b6-46d9-bfb7-fc239b7fbe1e"
     wsmap="managed"
   >
@@ -13367 +13382 @@
         virtual machines are running at the same time to prevent I/O cache related hangs.
         This option new with the API of VirtualBox 3.2 and is now the default for non-IDE storage controllers.
+      </desc>
+    </attribute>
+
+    <attribute name="bootable" type="boolean" readonly="yes">
+      <desc>
+        Returns whether it is possible to boot from disks attached to this controller.
       </desc>
     </attribute>

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

@@ -507 +507 @@
     STDMETHOD(GetStorageControllerByName(IN_BSTR aName, IStorageController **storageController));
     STDMETHOD(GetStorageControllerByInstance(ULONG aInstance, IStorageController **storageController));
+    STDMETHOD(SetStorageControllerBootable)(IN_BSTR aName, BOOL fBootable);
     STDMETHOD(QuerySavedGuestSize)(ULONG aScreenId, ULONG *puWidth, ULONG *puHeight);
     STDMETHOD(QuerySavedThumbnailSize)(ULONG aScreenId, ULONG *aSize, ULONG *aWidth, ULONG *aHeight);

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

@@ -51 +51 @@
                  const Utf8Str &aName,
                  StorageBus_T aBus,
-                 ULONG aInstance);
+                 ULONG aInstance,
+                 bool fBootable);
     HRESULT init(Machine *aParent,
                  StorageController *aThat,
@@ -73 +74 @@
     STDMETHOD(COMGETTER(UseHostIOCache)) (BOOL *fUseHostIOCache);
     STDMETHOD(COMSETTER(UseHostIOCache)) (BOOL fUseHostIOCache);
+    STDMETHOD(COMGETTER(Bootable)) (BOOL *fBootable);
 
     // StorageController methods
@@ -84 +86 @@
     StorageBus_T getStorageBus() const;
     ULONG getInstance() const;
+    bool getBootable() const;
 
     HRESULT checkPortAndDeviceValid(LONG aControllerPort,
                                     LONG aDevice);
+
+    void setBootable(BOOL fBootable);
 
     void rollback();

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

@@ -2814 +2814 @@
             // default from constructor is 0
 
+        pelmController->getAttributeValue("Bootable", sctl.fBootable);
+            // default from constructor is true which is true
+            // for settings below version 1.11 because they allowed only
+            // one controller per type.
+
         Utf8Str strType;
         if (!pelmController->getAttributeValue("type", strType))
@@ -3993 +3998 @@
             pelmController->setAttribute("useHostIOCache", sc.fUseHostIOCache);
 
+        if (m->sv >= SettingsVersion_v1_11)
+            pelmController->setAttribute("Bootable", sc.fBootable);
+
         if (sc.controllerType == StorageControllerType_IntelAhci)
         {
@@ -4390 +4398 @@
     }
 
+    // Settings version 1.11 is required if more than one controller of each type
+    // is present.
+    if (m->sv < SettingsVersion_v1_11)
+    {
+        size_t cSata = 0;
+        size_t cScsiLsi = 0;
+        size_t cScsiBuslogic = 0;
+        size_t cSas = 0;
+        size_t cIde = 0;
+        size_t cFloppy = 0;
+
+        for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
+             it != storageMachine.llStorageControllers.end();
+             ++it)
+        {
+            switch ((*it).storageBus)
+            {
+                case StorageBus_IDE:
+                    cIde++;
+                    break;
+                case StorageBus_SATA:
+                    cSata++;
+                    break;
+                case StorageBus_SAS:
+                    cSas++;
+                    break;
+                case StorageBus_SCSI:
+                    if ((*it).controllerType == StorageControllerType_LsiLogic)
+                        cScsiLsi++;
+                    else
+                        cScsiBuslogic++;
+                    break;
+                case StorageBus_Floppy:
+                    cFloppy++;
+                    break;
+                default:
+                    // Do nothing
+                    break;
+            }
+
+            if (   cSata > 1
+                || cScsiLsi > 1
+                || cScsiBuslogic > 1
+                || cSas > 1
+                || cIde > 1
+                || cFloppy > 1)
+                m->sv = SettingsVersion_v1_11;
+        }
+    }
+
     // settings version 1.9 is required if there is not exactly one DVD
     // or more than one floppy drive present or the DVD is not at the secondary