Changeset 7457 in vbox

Timestamp:

Mar 14, 2008 12:17:16 PM (17 years ago)

Author:

vboxsync

Message:

AHCI: add configuration options for VBoxManage and fix two mistakes

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/Makefile.kmk (modified) (1 diff)
• Frontends/VBoxManage/VBoxManage.cpp (modified) (6 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/SATAControllerImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -26 +26 @@
                          $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
                          $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
-                         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,)
+                         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
+                         $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,)
 VBoxManage_SOURCES     = \
         VBoxManage.cpp \

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

@@ -400 +400 @@
         RTPrintf("                            [-usb on|off]\n"
                  "                            [-usbehci on|off]\n"
-                 "                            [-snapshotfolder default|<path>]\n"
-                 "\n");
+                 "                            [-snapshotfolder default|<path>]\n");
+#ifdef VBOX_WITH_AHCI
+        RTPrintf("                            [-sata on|off]\n"
+                 "                            [-sataport<1-30> none|<uuid>|<filename>]\n"
+                 "                            [-sataideemulation hda|hdb|hdc|hdd <1-30>]\n");
+#endif
+        RTPrintf("\n");
     }
 
@@ -1999 +2004 @@
         RTPrintf("\n");
 
+    /*
+     * SATA.
+     */
+    ComPtr<ISATAController> SATACtl;
+    rc = machine->COMGETTER(SATAController)(SATACtl.asOutParam());
+    if (SUCCEEDED(rc))
+    {
+        BOOL fEnabled;
+        rc = SATACtl->COMGETTER(Enabled)(&fEnabled);
+        if (FAILED(rc))
+            fEnabled = false;
+        if (details == VMINFO_MACHINEREADABLE)
+            RTPrintf("sata=\"%s\"\n", fEnabled ? "on" : "off");
+        else
+            RTPrintf("SATA:            %s\n", fEnabled ? "enabled" : "disabled");
+    }
+
     if (console)
     {
@@ -3680 +3702 @@
     DeviceType_T bootDevice[4];
     int bootDeviceChanged[4] = { false };
-    char *hdds[4] = {0};
+    char *hdds[34] = {0};
     char *dvd = NULL;
     char *dvdpassthrough = NULL;
@@ -3699 +3721 @@
     ULONG guestMemBalloonSize = (ULONG)-1;
     ULONG guestStatInterval = (ULONG)-1;
+    int   fSataEnabled = -1;
+    int   sataBootDevices[4] = {-1,-1,-1,-1};
 
     /* VM ID + at least one parameter. Parameter arguments are checked
@@ -4307 +4331 @@
                 return errorArgument("Error parsing guest statistics interval '%s'", argv[i]);
             guestStatInterval = uVal;
+        }
+        else if (strcmp(argv[i], "-sata") == 0)
+        {
+            if (argc <= i + 1)
+            {
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            }
+            i++;
+            if (strcmp(argv[i], "on") == 0 || strcmp(argv[i], "enable") == 0)
+                fSataEnabled = 1;
+            else if (strcmp(argv[i], "off") == 0 || strcmp(argv[i], "disable") == 0)
+                fSataEnabled = 0;
+            else
+                return errorArgument("Invalid -usb argument '%s'", argv[i]);
+        }
+        else if (strncmp(argv[i], "-sataport", 9) == 0)
+        {
+            unsigned n = parseNum(&argv[i][9], 30, "SATA");
+            if (!n)
+                return 1;
+            if (argc <= i + 1)
+            {
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            }
+            i++;
+            hdds[n+3] = argv[i];
+        }
+        else if (strcmp(argv[i], "-sataideemulation") == 0)
+        {
+            unsigned bootDevicePos = 0;
+            unsigned n;
+
+            if (argc <= i + 2)
+            {
+                return errorArgument("Missing arguments to '%s'", argv[i]);
+            }
+            i++;
+
+            if (strcmp(argv[i], "hda") == 0)
+                bootDevicePos = 0;
+            else if (strcmp(argv[i], "hdb") == 0)
+                bootDevicePos = 1;
+            else if (strcmp(argv[i], "hdc") == 0)
+                bootDevicePos = 2;
+            else if (strcmp(argv[i], "hdd") == 0)
+                bootDevicePos = 3;
+            else
+                return errorArgument("Invalid argument to '%s'", argv[i-1]);
+
+            i++;
+            n = parseNum(argv[i], 30, "SATA");
+            if (!n)
+                return 1;
+
+            sataBootDevices[bootDevicePos] = n;
         }
         else
@@ -5274 +5353 @@
         if (guestStatInterval != (ULONG)-1)
             CHECK_ERROR(machine, COMSETTER(StatisticsUpdateInterval)(guestStatInterval));
+
+        /*
+         * SATA controller enable/disable
+         */
+        if (fSataEnabled != -1)
+        {
+            ComPtr<ISATAController> SataCtl;
+            CHECK_ERROR(machine, COMGETTER(SATAController)(SataCtl.asOutParam()));
+            if (SUCCEEDED(rc))
+            {
+                CHECK_ERROR(SataCtl, COMSETTER(Enabled)(!!fSataEnabled));
+            }
+        }
+
+        for (uint32_t i = 4; i < 34; i++)
+        {
+            if (hdds[i])
+            {
+                if (strcmp(hdds[i], "none") == 0)
+                {
+                    machine->DetachHardDisk(StorageBus_SATA, i-4, 0);
+                }
+                else
+                {
+                    /* first guess is that it's a UUID */
+                    Guid uuid(hdds[i]);
+                    ComPtr<IHardDisk> hardDisk;
+                    rc = virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
+                    /* not successful? Then it must be a filename */
+                    if (!hardDisk)
+                    {
+                        CHECK_ERROR(virtualBox, OpenHardDisk(Bstr(hdds[i]), hardDisk.asOutParam()));
+                        if (SUCCEEDED(rc) && hardDisk)
+                        {
+                            /* first check if it's already registered */
+                            Guid hddUUID;
+                            hardDisk->COMGETTER(Id)(hddUUID.asOutParam());
+                            ComPtr<IHardDisk> registeredHDD;
+                            rc = virtualBox->GetHardDisk(hddUUID, registeredHDD.asOutParam());
+                            if (SUCCEEDED(rc) && registeredHDD)
+                                hardDisk = registeredHDD;
+                            else
+                            {
+                                /* it has to be registered */
+                                CHECK_ERROR(virtualBox, RegisterHardDisk(hardDisk));
+                                if (FAILED(rc))
+                                    break;
+                            }
+                        }
+                    }
+                    if (hardDisk)
+                    {
+                        hardDisk->COMGETTER(Id)(uuid.asOutParam());
+                        CHECK_ERROR(machine, AttachHardDisk(uuid, StorageBus_SATA, i-4, 0));
+                    }
+                    else
+                        rc = E_FAIL;
+                    if (FAILED(rc))
+                        break;
+                }
+            }
+        }
+
+        for (uint32_t i = 0; i < 4; i++)
+        {
+            if (sataBootDevices[i] != -1)
+            {
+                ComPtr<ISATAController> SataCtl;
+                CHECK_ERROR(machine, COMGETTER(SATAController)(SataCtl.asOutParam()));
+                if (SUCCEEDED(rc))
+                {
+                    CHECK_ERROR(SataCtl, SetIDEEmulationPort(i, sataBootDevices[i]));
+                }
+            }
+        }
 
         /* commit changes */

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -606 +606 @@
             rc = CFGMR3InsertNode(pDevices, "ahci", &pDev);                             RC_CHECK();
             rc = CFGMR3InsertNode(pDev,     "0", &pSataInst);                           RC_CHECK();
-            rc = CFGMR3InsertInteger(pIdeInst, "Trusted",              1);              RC_CHECK();
-            rc = CFGMR3InsertInteger(pIdeInst, "PCIDeviceNo",          13);             RC_CHECK();
+            rc = CFGMR3InsertInteger(pSataInst, "Trusted",              1);             RC_CHECK();
+            rc = CFGMR3InsertInteger(pSataInst, "PCIDeviceNo",          13);            RC_CHECK();
             Assert(!afPciDeviceNo[13]);
             afPciDeviceNo[13] = true;
-            rc = CFGMR3InsertInteger(pIdeInst, "PCIFunctionNo",        1);              RC_CHECK();
-            rc = CFGMR3InsertNode(pIdeInst,    "Config", &pCfg);                        RC_CHECK();
+            rc = CFGMR3InsertInteger(pSataInst, "PCIFunctionNo",        0);             RC_CHECK();
+            rc = CFGMR3InsertNode(pSataInst,    "Config", &pCfg);                       RC_CHECK();
 
             for (uint32_t i = 0; i < 4; i++)

trunk/src/VBox/Main/SATAControllerImpl.cpp

@@ -223 +223 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    /* the machine needs to be mutable */
-    Machine::AutoMutableStateDependency adep (mParent);
-    CheckComRCReturnRC (adep.rc());
-    AutoLock alock (this);
-
     switch (DevicePosition)
     {