Changeset 15568 in vbox

Timestamp:

Dec 16, 2008 10:23:39 AM (16 years ago)

Author:

vboxsync

Message:

Main: HardDisk2: Pass per-image interfaces in *every* VDOpen/VDCreateDiff/etc call.

File:

• trunk/src/VBox/Main/HardDisk2Impl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -3407 +3407 @@
                     vrc = VDOpen (hdd, format, location,
                                   VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
-                                  NULL);
+                                  that->mm.vdDiskIfaces);
                     if (RT_FAILURE (vrc))
                     {
@@ -3427 +3427 @@
                                         NULL, targetId.raw(),
                                         VD_OPEN_FLAGS_NORMAL,
-                                        NULL, that->mm.vdDiskIfaces);
+                                        target->mm.vdDiskIfaces,
+                                        that->mm.vdDiskIfaces);
 
                     that->mm.vdProgress = NULL;
@@ -3574 +3575 @@
                                       it == chain->begin() ?
                                           VD_OPEN_FLAGS_INFO : 0,
-                                      NULL);
+                                      (*it)->mm.vdDiskIfaces);
                         if (RT_FAILURE (vrc))
                             throw vrc;
@@ -3624 +3625 @@
                                 vrc = VDOpen (hdd, Utf8Str ((*it)->mm.format),
                                               Utf8Str ((*it)->m.locationFull),
-                                              VD_OPEN_FLAGS_INFO, NULL);
+                                              VD_OPEN_FLAGS_INFO,
+                                              (*it)->mm.vdDiskIfaces);
                                 if (RT_FAILURE (vrc))
                                     throw vrc;
@@ -3864 +3866 @@
                     vrc = VDOpen (hdd, format, location,
                                   VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
-                                  NULL);
+                                  that->mm.vdDiskIfaces);
                     if (RT_FAILURE (vrc))
                     {
@@ -3886 +3888 @@
                     vrc = VDCopy (hdd, 0, targetHdd, targetFormat,
                                   targetLocation, false, 0, targetId.raw(),
-                                  NULL, NULL, that->mm.vdDiskIfaces);
+                                  NULL, target->mm.vdDiskIfaces,
+                                  that->mm.vdDiskIfaces);
 
                     that->mm.vdProgress = NULL;
@@ -4009 +4012 @@
                     vrc = VDOpen (hdd, format, location,
                                   VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
-                                  NULL);
+                                  that->mm.vdDiskIfaces);
                     if (RT_SUCCESS (vrc))
                         vrc = VDClose (hdd, true /* fDelete */);