Changeset 17075 in vbox

Timestamp:

Feb 24, 2009 3:13:31 PM (16 years ago)

Author:

vboxsync

Message:

ICH6 controller in UI and configs (don't think amount of work required to add
just new IDE controller type is adequate)

Location:

trunk/src/VBox

Files:

• Devices/Storage/DevATA.cpp (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxImportApplianceWgt.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxVMSettingsGeneral.cpp (modified) (2 diffs)
• Main/ApplianceImpl.cpp (modified) (1 diff)
• Main/BIOSSettingsImpl.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -6124 +6124 @@
      * Validate and read configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0IRQDelay\0R0Enabled\0PIIX4\0ICH6\0"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0IRQDelay\0R0Enabled\0Type\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("PIIX3 configuration error: unknown option specified"));
@@ -6148 +6148 @@
 
     pThis->u8Type = CHIPSET_PIIX3;
-    bool fPIIX4;
-    rc = CFGMR3QueryBoolDef(pCfgHandle, "PIIX4", &fPIIX4, false);
+    uint32_t type;
+    rc = CFGMR3QueryU32Def(pCfgHandle, "Type", &type, 0);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("PIIX3 configuration error: failed to read PIIX4 as boolean"));
-    Log(("%s: fPIIX4=%d\n", __FUNCTION__, fPIIX4));
-    if (fPIIX4)
-        pThis->u8Type = CHIPSET_PIIX4;
-
-    /** @todo: Need to implement better IDE chipset configuration mechanism */
-    bool fICH6;
-    rc = CFGMR3QueryBoolDef(pCfgHandle, "ICH6", &fICH6, false);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("PIIX3 configuration error: failed to read ICH6 as boolean"));
-    Log(("%s: fICH6=%d\n", __FUNCTION__, fICH6));
-    if (fICH6)
-        pThis->u8Type = CHIPSET_ICH6;
+                                N_("PIIX3 configuration error: failed to read Type as integer"));
+    Log(("%s: type=%d\n", __FUNCTION__, type));
+    /** See IDEControllerType in VirtualBox.xidl */
+    switch (type)
+    {
+        case 0:
+            /** @todo: what is right here? */
+            AssertMsgFailed(("What do we do here: type Null\n"));
+            break;
+        case 1:
+            pThis->u8Type = CHIPSET_PIIX3;
+            break;
+        case 2:
+            pThis->u8Type = CHIPSET_PIIX4;
+            break; 
+        case 3:
+            pThis->u8Type = CHIPSET_ICH6;
+            break;
+        default:
+            AssertMsgFailed(("Unknown IDE type: %d\n", type));
+    }
 
     /*

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

@@ -503 +503 @@
         case IDEControllerType_PIIX4:
             pszIdeController = "PIIX4";
+            break;
+        case IDEControllerType_ICH6:
+            pszIdeController = "ICH6";
             break;
         default:

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -3438 +3438 @@
     mIDEControllerTypes [KIDEControllerType_PIIX4] =
         tr ("PIIX4", "IDEControllerType");
+    mIDEControllerTypes [KIDEControllerType_ICH6] =
+        tr ("ICH6", "IDEControllerType");
 
     mUSBDeviceStates [KUSBDeviceState_NotSupported] =

trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportApplianceWgt.cpp

@@ -445 +445 @@
                     e->addItem (vboxGlobal().toString (KIDEControllerType_PIIX3), "PIIX3");
                     e->addItem (vboxGlobal().toString (KIDEControllerType_PIIX4), "PIIX4");
+                    e->addItem (vboxGlobal().toString (KIDEControllerType_ICH6),  "ICH6");
                     editor = e;
                     break;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsGeneral.cpp

@@ -138 +138 @@
     mCbIDEController->addItem (""); /* KIDEControllerType_PIIX3 */
     mCbIDEController->addItem (""); /* KIDEControllerType_PIIX4 */
+    mCbIDEController->addItem (""); /* KIDEControllerType_ICH6  */
 
     qApp->installEventFilter (this);
@@ -460 +461 @@
     mCbIDEController->setItemText (0, vboxGlobal().toString (KIDEControllerType_PIIX3));
     mCbIDEController->setItemText (1, vboxGlobal().toString (KIDEControllerType_PIIX4));
+    mCbIDEController->setItemText (2, vboxGlobal().toString (KIDEControllerType_ICH6));
 
     /* Path selector */

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1883 +1883 @@
                 else if (!strcmp(pcszIDEType, "PIIX4"))
                     rc = biosSettings->COMSETTER(IDEControllerType)(IDEControllerType_PIIX4);
+                else if (!strcmp(pcszIDEType, "ICH6"))
+                    rc = biosSettings->COMSETTER(IDEControllerType)(IDEControllerType_ICH6);
                 else
                     throw setError(VBOX_E_FILE_ERROR,

trunk/src/VBox/Main/BIOSSettingsImpl.cpp

@@ -442 +442 @@
         case IDEControllerType_PIIX3:
         case IDEControllerType_PIIX4:
+        case IDEControllerType_ICH6:
             break;
         default:
@@ -601 +602 @@
             else if (strcmp (typeStr, "PIIX4") == 0)
                 mData->mIDEControllerType = IDEControllerType_PIIX4;
+            else if (strcmp (typeStr, "ICH6") == 0)
+                mData->mIDEControllerType = IDEControllerType_ICH6;
             else
                 ComAssertMsgFailedRet (("Invalid boot menu mode '%s'", typeStr),
@@ -698 +701 @@
                 ideControllerTypeStr = "PIIX4";
                 break;
+            case IDEControllerType_ICH6:
+                ideControllerTypeStr = "ICH6";
+                break;
             default:
                 ComAssertMsgFailedRet (("Invalid IDE Controller type: %d",

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -276 +276 @@
      */
     IDEControllerType_T controllerType;
-    BOOL fPIIX4, fICH6;
     hrc = biosSettings->COMGETTER(IDEControllerType)(&controllerType);               H();
-    switch (controllerType)
-    {
-        case IDEControllerType_PIIX3:
-            fPIIX4 = FALSE;
-            break;
-        case IDEControllerType_PIIX4:
-            fPIIX4 = TRUE;
-            break;
-        default:
-            AssertMsgFailed(("Invalid IDE controller type '%d'", controllerType));
-            return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
-                              N_("Invalid IDE controller type '%d'"), controllerType);
-    }
-#ifdef VBOX_WITH_SMC
-    /** @todo: gross hack, rewrite appropriately */
-    fPIIX4 = FALSE;
-    fICH6 = TRUE;
-#else
-    fICH6 = FALSE;
-#endif
 
     /*
@@ -801 +780 @@
     rc = CFGMR3InsertInteger(pIdeInst, "PCIFunctionNo",        1);                  RC_CHECK();
     rc = CFGMR3InsertNode(pIdeInst,    "Config", &pCfg);                            RC_CHECK();
-    rc = CFGMR3InsertInteger(pCfg,  "PIIX4", fPIIX4);               /* boolean */   RC_CHECK();
-    rc = CFGMR3InsertInteger(pCfg,  "ICH6",  fICH6);                /* boolean */   RC_CHECK();
+    rc = CFGMR3InsertInteger(pCfg,  "Type", (uint32_t)controllerType);              RC_CHECK();
 
     /* Attach the status driver */

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

@@ -881 +881 @@
     <const name="PIIX3"           value="1"/>
     <const name="PIIX4"           value="2"/>
+    <const name="ICH6"            value="3"/>
   </enum>
 

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -237 +237 @@
     <xsd:enumeration value="PIIX3"/>
     <xsd:enumeration value="PIIX4"/>
+    <xsd:enumeration value="ICH6"/>
   </xsd:restriction>
 </xsd:simpleType>