Changeset 17077 in vbox for trunk

Timestamp:

Feb 24, 2009 4:58:15 PM (16 years ago)

Author:

vboxsync

Message:

pass IDE controller type as string in config

Location:

trunk/src/VBox

Files:

• Devices/Storage/DevATA.cpp (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)

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

@@ -6086 +6086 @@
 }
 
+/**
+ * Convert config value to DEVPCBIOSBOOT.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns     The device instance data.
+ * @param   pCfgHandle  Configuration handle.
+ * @param   penmChipset Where to store the chipset type.
+ */
+static int ataControllerFromCfg(PPDMDEVINS pDevIns, PCFGMNODE pCfgHandle, CHIPSET *penmChipset)
+{
+    char szType[20];
+
+    int rc = CFGMR3QueryString(pCfgHandle, "Type", &szType[0], sizeof(szType));
+    if (RT_FAILURE(rc))
+        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
+                                   N_("Configuration error: Querying \"Type\" as a string failed"));
+    if (!strcmp(szType, "PIIX3"))
+        *penmChipset = CHIPSET_PIIX3;
+    else if (!strcmp(szType, "PIIX4"))
+        *penmChipset = CHIPSET_PIIX4;
+    else if (!strcmp(szType, "ICH6"))
+        *penmChipset = CHIPSET_ICH6;
+    else
+    {
+        PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
+                            N_("Configuration error: The \"Type\" value \"%s\" is unknown"),
+                            szType);
+        rc = VERR_INTERNAL_ERROR;
+    }
+    return rc;
+}
+
 
 /**
@@ -6147 +6179 @@
     Assert(DelayIRQMillies < 50);
 
-    pThis->u8Type = CHIPSET_PIIX3;
-    uint32_t type;
-    rc = CFGMR3QueryU32Def(pCfgHandle, "Type", &type, 0);
+    CHIPSET enmChipset = CHIPSET_PIIX3;
+    rc = ataControllerFromCfg(pDevIns, pCfgHandle, &enmChipset);
     if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                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));
-    }
-
+        return rc;
+    pThis->u8Type = (uint8_t)enmChipset;
+    
     /*
      * Initialize data (most of it anyway).

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -80 +80 @@
 #endif
 
-
+/**
+ * Translate IDEControllerType_T to string representation.
+ */
+const char* controllerString(IDEControllerType_T enmType)
+{
+    switch (enmType)
+    {
+        case IDEControllerType_PIIX3:
+            return "PIIX3";
+        case IDEControllerType_PIIX4:
+            return "PIIX4";
+        case IDEControllerType_ICH6:
+            return "ICH6";
+        default:
+            return "Unknown";
+    }
+}
 /*
  * VC++ 8 / amd64 has some serious trouble with this function.
@@ -780 +796 @@
     rc = CFGMR3InsertInteger(pIdeInst, "PCIFunctionNo",        1);                  RC_CHECK();
     rc = CFGMR3InsertNode(pIdeInst,    "Config", &pCfg);                            RC_CHECK();
-    rc = CFGMR3InsertInteger(pCfg,  "Type", (uint32_t)controllerType);              RC_CHECK();
+    rc = CFGMR3InsertString(pCfg,  "Type", controllerString(controllerType));       RC_CHECK();
 
     /* Attach the status driver */