Changeset 65482 in vbox for trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

Timestamp:

Jan 27, 2017 2:10:44 PM (8 years ago)

Author:

vboxsync

Message:

Main/Console: Add the disk integrity driver into the chain if some specific extra data is present

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -3573 +3573 @@
                                              false /* fSetupMerge */,
                                              false /* fBuiltinIOCache */,
+                                             false /* fInsertDiskIntegrityDrv. */,
                                              0 /* uMergeSource */,
                                              0 /* uMergeTarget */,
@@ -3751 +3752 @@
                                              false /* fSetupMerge */,
                                              false /* fBuiltinIOCache */,
+                                             false /* fInsertDiskIntegrityDrv. */,
                                              0 /* uMergeSource */,
                                              0 /* uMergeTarget */,
@@ -6091 +6093 @@
         return rc;
 
+    bool fInsertDiskIntegrityDrv = false;
+    Bstr strDiskIntegrityFlag;
+    rc = mMachine->GetExtraData(Bstr("VBoxInternal2/EnableDiskIntegrityDriver").raw(),
+                                strDiskIntegrityFlag.asOutParam());
+    if (   rc   == S_OK
+        && strDiskIntegrityFlag == "1")
+        fInsertDiskIntegrityDrv = true;
+
     alock.release();
     vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY,
-                           (PFNRT)i_reconfigureMediumAttachment, 13,
+                           (PFNRT)i_reconfigureMediumAttachment, 14,
                            this, ptrVM.rawUVM(), pcszDevice, uInstance, enmBus, fUseHostIOCache,
-                           fBuiltinIOCache, true /* fSetupMerge */, aSourceIdx, aTargetIdx,
-                           aMediumAttachment, mMachineState, &rc);
+                           fBuiltinIOCache, fInsertDiskIntegrityDrv, true /* fSetupMerge */,
+                           aSourceIdx, aTargetIdx, aMediumAttachment, mMachineState, &rc);
     /* error handling is after resuming the VM */
 
@@ -6138 +6148 @@
 
     vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY,
-                           (PFNRT)i_reconfigureMediumAttachment, 13,
+                           (PFNRT)i_reconfigureMediumAttachment, 14,
                            this, ptrVM.rawUVM(), pcszDevice, uInstance, enmBus, fUseHostIOCache,
-                           fBuiltinIOCache, false /* fSetupMerge */, 0 /* uMergeSource */,
-                           0 /* uMergeTarget */, aMediumAttachment, mMachineState, &rc);
+                           fBuiltinIOCache, fInsertDiskIntegrityDrv, false /* fSetupMerge */,
+                           0 /* uMergeSource */, 0 /* uMergeTarget */, aMediumAttachment,
+                           mMachineState, &rc);
     /* error handling is after resuming the VM */
 
@@ -10016 +10027 @@
                                                          bool fUseHostIOCache,
                                                          bool fBuiltinIOCache,
+                                                         bool fInsertDiskIntegrityDrv,
                                                          bool fSetupMerge,
                                                          unsigned uMergeSource,
@@ -10043 +10055 @@
                                              fUseHostIOCache,
                                              fBuiltinIOCache,
+                                             fInsertDiskIntegrityDrv,
                                              fSetupMerge,
                                              uMergeSource,