Changeset 44365 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 25, 2013 10:24:45 AM (12 years ago)

Author:

vboxsync

Message:

Main: change API. Interface IMedium was touched. Handling enumeration MediumVariant was changed. PR5434.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMedium.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVD.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVD.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp

@@ -142 +142 @@
         mHardDiskFormat = mMedium.GetFormat();
         mHardDiskType = vboxGlobal().mediumTypeString (mMedium);
-        mStorageDetails = gpConverter->toString((KMediumVariant)mMedium.GetVariant());
+
+        QVector<KMediumVariant> mediumVariants_QVector = mMedium.GetVariant();
+        qlonglong mediumVariants_qlonglong = 0;
+        for (int i = 0; i < mediumVariants_QVector.size(); i++)
+            mediumVariants_qlonglong |= mediumVariants_QVector[i];
+
+        mStorageDetails = gpConverter->toString((KMediumVariant)mediumVariants_qlonglong);
         mIsReadOnly = mMedium.GetReadOnly();
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp

@@ -71 +71 @@
     }
 
+    QVector<KMediumVariant> l_variants(sizeof(uVariant)*8);
+
+    for (int i = 0; i < l_variants.size(); ++i)
+    {
+        qulonglong temp = uVariant;
+        l_variants [i] = (KMediumVariant)(temp & (1<<i));
+    }
+
     /* Copy existing virtual-disk to the new virtual-disk: */
-    progress = sourceVirtualDisk.CloneTo(virtualDisk, uVariant, CMedium());
+    progress = sourceVirtualDisk.CloneTo(virtualDisk, l_variants, CMedium());
     if (!virtualDisk.isOk())
     {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -74 +74 @@
     }
 
+    QVector<KMediumVariant> l_variants(sizeof(qulonglong)*8);
+
+    for (int i = 0; i < l_variants.size(); ++i)
+    {
+        qulonglong temp = uVariant;
+        l_variants [i] = (KMediumVariant)(temp & (1<<i));
+    }
+
     /* Create base storage for the new hard disk: */
-    progress = virtualDisk.CreateBaseStorage(uSize, uVariant);
+    progress = virtualDisk.CreateBaseStorage(uSize, l_variants);
+
     if (!virtualDisk.isOk())
     {