Changeset 5361 in vbox for trunk/src

Timestamp:

Oct 17, 2007 5:11:26 PM (17 years ago)

Author:

vboxsync

Message:

Added option to emulate PIIX4 IDE controller. Defaults to PIIX4 for new VMs
and to PIIX3 when no setting is present in XML.

Location:

trunk/src/VBox

Files:

• Devices/Bus/DevPCI.cpp (modified) (1 diff)
• Devices/Storage/DevATA.cpp (modified) (7 diffs)
• Main/BIOSSettingsImpl.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/MachineImpl.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/BIOSSettingsImpl.h (modified) (3 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -772 +772 @@
     {
     case 0x0101:
-        if (vendor_id == 0x8086 && device_id == 0x7010) {
-            /* PIIX3 IDE */
+        if (vendor_id == 0x8086 && 
+            (device_id == 0x7010 || device_id == 0x7111)) {
+            /* PIIX3 or PIIX4 IDE */
             pci_config_writew(d, 0x40, 0x8000); /* enable IDE0 */
             pci_config_writew(d, 0x42, 0x8000); /* enable IDE1 */

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

@@ -69 +69 @@
  * The SSM saved state version.
  */
-#define ATA_SAVED_STATE_VERSION 15
+#define ATA_SAVED_STATE_VERSION 16
 
 /** The maximum number of release log entries per device. */
@@ -378 +378 @@
     /** Flag whether R0 is enabled. */
     bool                fR0Enabled;
+    /** Flag indicating whether PIIX4 or PIIX3 is being emulated. */
+    bool                fPIIX4;
     bool                Alignment0[HC_ARCH_BITS == 64 ? 6 : 2]; /**< Align the struct size. */
 } PCIATAState;
@@ -5761 +5763 @@
         }
     }
+    SSMR3PutBool(pSSMHandle, pData->fPIIX4);
 
     return SSMR3PutU32(pSSMHandle, ~0); /* sanity/terminator */
@@ -5880 +5883 @@
         }
     }
+    SSMR3GetBool(pSSMHandle, &pData->fPIIX4);
 
     rc = SSMR3GetU32(pSSMHandle, &u32);
@@ -5922 +5926 @@
      * Validate and read configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0IRQDelay\0R0Enabled\0"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0IRQDelay\0R0Enabled\0PIIX4\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("PIIX3 configuration error: unknown option specified."));
@@ -5951 +5955 @@
     Assert(DelayIRQMillies < 50);
 
+    rc = CFGMR3QueryBool(pCfgHandle, "PIIX4", &pData->fPIIX4);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        pData->fPIIX4 = false;
+    else if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("PIIX3 configuration error: failed to read PIIX4 as boolean."));
+    Log(("%s: fPIIX4=%d\n", __FUNCTION__, pData->fPIIX4));
+
     /*
      * Initialize data (most of it anyway).
@@ -5961 +5973 @@
     pData->dev.config[0x00] = 0x86; /* Vendor: Intel */
     pData->dev.config[0x01] = 0x80;
-    pData->dev.config[0x02] = 0x10; /* Device: PIIX3 IDE */
-    pData->dev.config[0x03] = 0x70;
+    if (pData->fPIIX4) 
+    {
+        pData->dev.config[0x02] = 0x11; /* Device: PIIX4 IDE */
+        pData->dev.config[0x03] = 0x71;
+        pData->dev.config[0x08] = 0x01; /* Revision: PIIX4E */
+        pData->dev.config[0x48] = 0x00; /* UDMACTL */
+        pData->dev.config[0x4A] = 0x00; /* UDMATIM */
+        pData->dev.config[0x4B] = 0x00;
+    }
+    else
+    {
+        pData->dev.config[0x02] = 0x10; /* Device: PIIX3 IDE */
+        pData->dev.config[0x03] = 0x70;
+    }
     pData->dev.config[0x04] = PCI_COMMAND_IOACCESS | PCI_COMMAND_MEMACCESS | PCI_COMMAND_BUSMASTER;
     pData->dev.config[0x09] = 0x8a; /* programming interface = PCI_IDE bus master is supported */

trunk/src/VBox/Main/BIOSSettingsImpl.cpp

@@ -405 +405 @@
 }
 
+STDMETHODIMP BIOSSettings::COMGETTER(IDEControllerType)(IDEControllerType_T *aControllerType)
+{
+    if (!aControllerType)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *aControllerType = mData->mIDEControllerType;
+
+    return S_OK;
+}
+
+STDMETHODIMP BIOSSettings::COMSETTER(IDEControllerType)(IDEControllerType_T aControllerType)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* the machine needs to be mutable */
+    Machine::AutoMutableStateDependency adep (mParent);
+    CheckComRCReturnRC (adep.rc());
+
+    AutoLock alock (this);
+
+    /* make sure the value is allowed */
+    switch (aControllerType)
+    {
+        case IDEControllerType_IDEControllerPIIX3:
+        case IDEControllerType_IDEControllerPIIX4:
+            break;
+        default:
+            return setError (E_FAIL,
+                tr("Invalid IDE controller type '%d'"),
+                aControllerType);
+    }    
+
+    mData.backup();
+
+    mData->mIDEControllerType = aControllerType;
+
+    return S_OK;
+}
+
 STDMETHODIMP BIOSSettings::COMGETTER(TimeOffset)(LONG64 *offset)
 {

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -174 +174 @@
 
     /*
+     * Virtual IDE controller type.
+     */
+    IDEControllerType_T controllerType;
+    BOOL fPIIX4;
+    hrc = biosSettings->COMGETTER(IDEControllerType)(&controllerType);               H();
+    switch (controllerType)
+    {
+        case IDEControllerType_IDEControllerPIIX3:
+            fPIIX4 = FALSE;
+            break;
+        case IDEControllerType_IDEControllerPIIX4:
+            fPIIX4 = TRUE;
+            break;
+        default:
+            AssertMsgFailed(("Invalid IDE controller type '%d'", controllerType));
+            return VERR_INVALID_PARAMETER;
+    }
+
+    /*
      * PDM config.
      *  Load drivers in VBoxC.[so|dll]
@@ -553 +572 @@
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        1);                     RC_CHECK();
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
+    rc = CFGMR3InsertInteger(pCfg,  "PIIX4", fPIIX4);               /* boolean */   RC_CHECK();
 
     /* Attach the status driver */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4412 +4412 @@
                 }
             }
+
+            /* IDE controller type (optional, defaults to PIIX3) */
+            {
+                CFGNODE ideControllerNode = 0;
+                IDEControllerType_T controllerType = IDEControllerType_IDEControllerPIIX3;
+                CFGLDRGetChildNode (biosNode, "IDEController", 0, &ideControllerNode);
+                if (ideControllerNode)
+                {
+                    Bstr IDEControllerType;
+
+                    CFGLDRQueryBSTR (ideControllerNode, "type", IDEControllerType.asOutParam());
+                    ComAssertBreak (IDEControllerType, rc = E_FAIL);
+
+                    if (IDEControllerType.compare(Bstr("PIIX3")) == 0)
+                        controllerType = IDEControllerType_IDEControllerPIIX3;
+                    else if (IDEControllerType.compare(Bstr("PIIX4")) == 0)
+                        controllerType = IDEControllerType_IDEControllerPIIX4;
+                    else
+                        ComAssertBreak (0, rc = E_FAIL);
+
+                    CFGLDRReleaseNode (ideControllerNode);
+                }
+                mBIOSSettings->COMSETTER(IDEControllerType)(controllerType);
+            }
+
         }
         while (0);
@@ -6334 +6359 @@
             CFGLDRSetBool (pxedebugNode, "enabled", !!fSet);
             CFGLDRReleaseNode (pxedebugNode);
+
+            /* IDE controller type */
+            CFGNODE ideControllerNode = 0;
+            IDEControllerType_T controllerType;
+            CFGLDRCreateChildNode (biosNode, "IDEController", &ideControllerNode);
+            mBIOSSettings->COMGETTER(IDEControllerType)(&controllerType);
+            switch (controllerType)
+            {
+                case IDEControllerType_IDEControllerPIIX3:
+                    CFGLDRSetString (ideControllerNode, "type", "PIIX3");
+                    break;
+                case IDEControllerType_IDEControllerPIIX4:
+                    CFGLDRSetString (ideControllerNode, "type", "PIIX4");
+                    break;
+                default:
+                    ComAssertMsgFailedBreak (("Invalid IDE Controller type: %d\n",
+                                              controllerType), rc = E_FAIL);
+            }
+            CFGLDRReleaseNode (ideControllerNode);
 
         }

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

@@ -2042 +2042 @@
   </enum>
 
+  <enum
+     name="IDEControllerType"
+     uuid="445330e3-202a-4dab-854f-ce22e6cb9715"
+     >
+    <const name="InvalidIDEControllerType"       value="0"/>
+    <const name="IDEControllerPIIX3"             value="1"/>
+    <const name="IDEControllerPIIX4"             value="2"/>
+  </enum>
+
   <interface
      name="IBIOSSettings" extends="$unknown"
@@ -2092 +2101 @@
         PXE debug logging flag. If set, VirtualBox will write extensive
         PXE trace information to the release log.
+      </desc>
+    </attribute>
+
+    <attribute name="IDEControllerType" type="IDEControllerType">
+      <desc>
+        Type of the virtual IDE controller. Depending on this value,
+        VirtualBox will provide different virtual IDE hardware
+        devices to the guest.
       </desc>
     </attribute>

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

@@ -43 +43 @@
             mPXEDebugEnabled = false;
             mTimeOffset = 0;
+            mIDEControllerType = IDEControllerType_IDEControllerPIIX4;
         }
 
@@ -59 +60 @@
         }
 
-        BOOL               mLogoFadeIn;
-        BOOL               mLogoFadeOut;
-        ULONG              mLogoDisplayTime;
-        Bstr               mLogoImagePath;
-        BIOSBootMenuMode_T mBootMenuMode;
-        BOOL               mACPIEnabled;
-        BOOL               mIOAPICEnabled;
-        BOOL               mPXEDebugEnabled;
-        LONG64             mTimeOffset;
+        BOOL                mLogoFadeIn;
+        BOOL                mLogoFadeOut;
+        ULONG               mLogoDisplayTime;
+        Bstr                mLogoImagePath;
+        BIOSBootMenuMode_T  mBootMenuMode;
+        BOOL                mACPIEnabled;
+        BOOL                mIOAPICEnabled;
+        BOOL                mPXEDebugEnabled;
+        LONG64              mTimeOffset;
+        IDEControllerType_T mIDEControllerType;
     };
 
@@ -106 +108 @@
     STDMETHOD(COMGETTER(PXEDebugEnabled))(BOOL *enabled);
     STDMETHOD(COMSETTER(PXEDebugEnabled))(BOOL enable);
+    STDMETHOD(COMGETTER(IDEControllerType))(IDEControllerType_T *controllerType);
+    STDMETHOD(COMSETTER(IDEControllerType))(IDEControllerType_T controllerType);
     STDMETHOD(COMGETTER)(TimeOffset)(LONG64 *offset);
     STDMETHOD(COMSETTER)(TimeOffset)(LONG64 offset);

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

@@ -189 +189 @@
       <xsd:enumeration value="messageandmenu"/>
     </xsd:restriction>
+</xsd:simpleType>
+
+<xsd:simpleType name="TIDEControllerType">
+  <xsd:restriction base="xsd:string">
+    <xsd:enumeration value="PIIX3"/>
+    <xsd:enumeration value="PIIX4"/>
+  </xsd:restriction>
 </xsd:simpleType>
 
@@ -470 +477 @@
       </xsd:complexType>
     </xsd:element>
+    <xsd:element name="IDEController" minOccurs="0">
+      <xsd:complexType>
+          <xsd:attribute name="type" use="required" type="TIDEControllerType"/>
+      </xsd:complexType>
+    </xsd:element>
   </xsd:all>
 </xsd:complexType>