Changeset 25326 in vbox

Timestamp:

Dec 11, 2009 1:09:40 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55907

Message:

Main/Machine+MediumAttachment: fix loading the passthrough setting

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• MediumAttachmentImpl.cpp (modified) (4 diffs)
• include/MediumAttachmentImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -6346 +6346 @@
                                dev.lPort,
                                dev.lDevice,
-                               dev.deviceType);
+                               dev.deviceType,
+                               dev.fPassThrough);
         if (FAILED(rc)) break;
 
@@ -7153 +7154 @@
         if (pMedium)
         {
-            BOOL fHostDrive = false;
+            BOOL fHostDrive = FALSE;
             rc = pMedium->COMGETTER(HostDrive)(&fHostDrive);
             if (FAILED(rc))

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -102 +102 @@
  * @param aPort       Port number.
  * @param aDevice     Device number on the port.
- * @param aImplicit   Wether the attachment contains an implicitly created diff.
+ * @param aPassthrough Wether accesses are directly passed to the host drive.
  */
 HRESULT MediumAttachment::init(Machine *aParent,
@@ -110 +110 @@
                                LONG aDevice,
                                DeviceType_T aType,
-                               bool aImplicit /*= false*/)
-{
-    LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aParent=%p aMedium=%p aControllerName=%ls aPort=%d aDevice=%d aType=%d aImplicit=%d\n", aParent, aMedium, aControllerName.raw(), aPort, aDevice, aType, aImplicit));
+                               bool aPassthrough)
+{
+    LogFlowThisFuncEnter();
+    LogFlowThisFunc(("aParent=%p aMedium=%p aControllerName=%ls aPort=%d aDevice=%d aType=%d aPassthrough=%d\n", aParent, aMedium, aControllerName.raw(), aPort, aDevice, aType, aPassthrough));
 
     if (aType == DeviceType_HardDisk)
@@ -131 +131 @@
     unconst(m->bd->lPort)   = aPort;
     unconst(m->bd->lDevice) = aDevice;
-    unconst(m->bd->type)   = aType;
-
-    m->bd->fPassthrough = false;
-    m->bd->fImplicit = aImplicit;
+    unconst(m->bd->type)    = aType;
+
+    m->bd->fPassthrough = aPassthrough;
+    /* Newly created attachments never have an implicitly created medium
+     * associated with them. Implicit diff image creation happens later. */
+    m->bd->fImplicit = false;
 
     /* Confirm a successful initialization when it's the case */
@@ -146 +148 @@
                           psz ? psz - ctlName.c_str() : 4, ctlName.c_str(),
                           aPort, aDevice, Global::stringifyDeviceType(aType),
-                          aImplicit ? ":I" : "");
+                          m->bd->fImplicit ? ":I" : "");
 
     LogFlowThisFunc(("LEAVE - %s\n", getLogName()));

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

@@ -56 +56 @@
                  LONG aDevice,
                  DeviceType_T aType,
-                 bool aImplicit = false);
+                 bool fPassthrough);
     void uninit();