Changeset 28888 in vbox

Timestamp:

Apr 29, 2010 11:50:05 AM (15 years ago)

Author:

vboxsync

Message:

Main/Medium: new stub medium type "Shareable", plus assorted frontend changes to prepare its use.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• Main/MediumImpl.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -109 +109 @@
     else if (!RTStrICmp(psz, "writethrough"))
         DiskType = MediumType_Writethrough;
+    else if (!RTStrICmp(psz, "shareable"))
+        DiskType = MediumType_Shareable;
     else
         rc = VERR_PARSE_ERROR;
@@ -1231 +1233 @@
                 typeStr = "writethrough";
                 break;
+            case MediumType_Shareable:
+                typeStr = "shareable";
+                break;
         }
         RTPrintf("Type:                 %s\n", typeStr);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -124 +124 @@
             case MediumType_Writethrough:
                 typeStr = "writethrough";
+                break;
+            case MediumType_Shareable:
+                typeStr = "shareable";
                 break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -3063 +3063 @@
     mDiskTypes [KMediumType_Immutable] =        tr ("Immutable", "DiskType");
     mDiskTypes [KMediumType_Writethrough] =     tr ("Writethrough", "DiskType");
+    mDiskTypes [KMediumType_Shareable] =        tr ("Shareable", "DiskType");
     mDiskTypes_Differencing =                   tr ("Differencing", "DiskType");
 

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1383 +1383 @@
     }
 
+    /** @todo implement this case later */
+    CheckComArgExpr(aType, aType != MediumType_Shareable);
+
     if (m->type == aType)
     {
@@ -1395 +1398 @@
                         m->strLocationFull.raw());
 
-    /* cannot change the type of a hard disk being in use */
-    if (m->backRefs.size() != 0)
+    /* cannot change the type of a hard disk being in use by more than one VM */
+    if (m->backRefs.size() > 1)
         return setError(E_FAIL,
                         tr("Cannot change the type of hard disk '%s' because it is attached to %d virtual machines"),
@@ -1412 +1415 @@
         }
         case MediumType_Writethrough:
-        {
-            /* cannot change to writethrough if there are children */
+        case MediumType_Shareable:
+        {
+            /* cannot change to writethrough or shareable if there are children */
             if (getChildren().size() != 0)
                 return setError(E_FAIL,
@@ -2934 +2938 @@
         }
         case MediumType_Immutable:
-        {
             return true;
-        }
         case MediumType_Writethrough:
-        {
+        case MediumType_Shareable:
             return false;
-        }
         default:
             break;

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

@@ -9137 +9137 @@
   <enum
     name="MediumType"
-    uuid="11f6f7a5-0327-409a-9d42-7db6a0cec578"
+    uuid="46bf1fd4-ad86-4ded-8c49-28bd2d148e5a"
    >
     <desc>
@@ -9160 +9160 @@
         Write through medium (attached directly, ignored when
         taking snapshots).
+      </desc>
+    </const>
+    <const name="Shareable"         value="3">
+      <desc>
+        Allow using this medium concurrently by several machines.
+        <note>This is a stub value. Not usable until this note is removed.</note>
       </desc>
     </const>

trunk/src/VBox/Main/xml/Settings.cpp

@@ -921 +921 @@
             else if (strType == "WRITETHROUGH")
                 med.hdType = MediumType_Writethrough;
+            else if (strType == "SHAREABLE")
+            {
+                /// @todo remove check once the medium type is implemented
+                throw ConfigFileError(this, &elmMedium, N_("HardDisk/@type attribute of Shareable is not implemented yet"));
+                med.hdType = MediumType_Shareable;
+            }
             else
                 throw ConfigFileError(this, &elmMedium, N_("HardDisk/@type attribute must be one of Normal, Immutable or Writethrough"));
@@ -1178 +1184 @@
             mdm.hdType == MediumType_Normal ? "Normal" :
             mdm.hdType == MediumType_Immutable ? "Immutable" :
-            /*mdm.hdType == MediumType_Writethrough ?*/ "Writethrough";
+            mdm.hdType == MediumType_Writethrough ? "Writethrough" :
+            mdm.hdType == MediumType_Shareable ? "Shareable" : "INVALID";
         pelmHardDisk->setAttribute("type", pcszType);
     }