Changeset 33307 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 21, 2010 1:05:39 PM (14 years ago)

Author:

vboxsync

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

66878

Message:

Main/Medium: new MediumType_Readonly, replaces the DeviceType_DVD hacks and later will allow truly readonly floppies and so on.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (3 diffs)
• MachineImpl.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (7 diffs)
• SnapshotImpl.cpp (modified) (3 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2924 +2924 @@
 
             if (    pMedium
-                && (    enmType == DeviceType_DVD
+                && (   enmType == DeviceType_DVD
                     || enmType == DeviceType_Floppy
             ))
@@ -2986 +2986 @@
                 InsertConfigString(pCfg, "Format", bstr);
 
-                /* DVDs are always readonly, floppies may be readonly */
-                if (enmType == DeviceType_DVD)
+                if (mediumType == MediumType_Readonly)
                 {
                     InsertConfigInteger(pCfg, "ReadOnly", 1);
@@ -3005 +3004 @@
                  *        make DrvVD undo TempReadOnly.  It gets interesting if we fail after
                  *        that. Grumble. */
-                else if (   aMachineState == MachineState_TeleportingIn
-                         || aMachineState == MachineState_FaultTolerantSyncing)
+                if (   enmType == DeviceType_HardDisk
+                    && (   aMachineState == MachineState_TeleportingIn
+                        || aMachineState == MachineState_FaultTolerantSyncing))
                 {
                     InsertConfigInteger(pCfg, "TempReadOnly", 1);

trunk/src/VBox/Main/MachineImpl.cpp

@@ -11349 +11349 @@
         {
             MediumType_T mediumType = pMedium->getType();
-            bool fIsReadOnlyImage =    devType == DeviceType_DVD
-                                    || mediumType == MediumType_Shareable;
+            bool fIsReadOnlyLock =    mediumType == MediumType_Readonly
+                                   || mediumType == MediumType_Shareable;
             bool fIsVitalImage = (devType == DeviceType_HardDisk);
 
             mrc = pMedium->createMediumLockList(fIsVitalImage /* fFailIfInaccessible */,
-                                                !fIsReadOnlyImage /* fMediumLockWrite */,
+                                                !fIsReadOnlyLock /* fMediumLockWrite */,
                                                 NULL,
                                                 *pMediumLockList);

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1192 +1192 @@
             m->type = data.hdType;
     }
+    else if (aDeviceType == DeviceType_DVD)
+        m->type = MediumType_Readonly;
     else
         m->type = MediumType_Writethrough;
@@ -1280 +1282 @@
     unconst(m->id) = uuid;
 
-    m->type = MediumType_Writethrough;
+    if (aDeviceType == DeviceType_DVD)
+        m->type = MediumType_Readonly;
+    else
+        m->type = MediumType_Writethrough;
     m->devType = aDeviceType;
     m->state = MediumState_Created;
@@ -1646 +1651 @@
         case MediumType_Writethrough:
         case MediumType_Shareable:
-        {
-            /* cannot change to writethrough or shareable if there are children */
+        case MediumType_Readonly:
+        {
+            /* cannot change to writethrough, shareable or readonly
+             * if there are children */
             if (getChildren().size() != 0)
                 return setError(VBOX_E_OBJECT_IN_USE,
@@ -2427 +2434 @@
                         tr("Medium type of '%s' is Shareable"),
                         m->strLocationFull.c_str());
+    else if (m->type == MediumType_Readonly)
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("Medium type of '%s' is Readonly"),
+                        m->strLocationFull.c_str());
 
     /* Apply the normal locking logic to the entire chain. */
@@ -3244 +3255 @@
         case MediumType_Writethrough:
         case MediumType_Shareable:
+        case MediumType_Readonly: /* explicit readonly media has no diffs */
             return false;
         default:
@@ -3772 +3784 @@
      * generate an UUID if it is missing) */
     if (    (m->hddOpenMode == OpenReadOnly)
+         || m->type == MediumType_Readonly
          || !isImport
        )
@@ -4582 +4595 @@
 
         ComAssertThrow(   m->type != MediumType_Writethrough
-                       && m->type != MediumType_Shareable, E_FAIL);
+                       && m->type != MediumType_Shareable
+                       && m->type != MediumType_Readonly, E_FAIL);
         ComAssertThrow(m->state == MediumState_LockedRead, E_FAIL);
 

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -2148 +2148 @@
             // so do nothing for them
             if (   type != MediumType_Writethrough
-                && type != MediumType_Shareable)
+                && type != MediumType_Shareable
+                && type != MediumType_Readonly)
             {
                 // normal or immutable media need attention
@@ -2364 +2365 @@
 
             {
-                // writethrough and shareable images are unaffected by
-                // snapshots, skip them
+                // writethrough, shareable and readonly images are
+                // unaffected by snapshots, skip them
                 AutoReadLock medlock(pHD COMMA_LOCKVAL_SRC_POS);
                 MediumType_T type = pHD->getType();
                 if (   type == MediumType_Writethrough
-                    || type == MediumType_Shareable)
+                    || type == MediumType_Shareable
+                    || type == MediumType_Readonly)
                     continue;
             }
@@ -2843 +2845 @@
     AutoWriteLock alock(aHD COMMA_LOCKVAL_SRC_POS);
 
-    // Medium must not be writethrough/shareable at this point
+    // Medium must not be writethrough/shareable/readonly at this point
     MediumType_T type = aHD->getType();
     AssertReturn(   type != MediumType_Writethrough
-                 && type != MediumType_Shareable, E_FAIL);
+                 && type != MediumType_Shareable
+                 && type != MediumType_Readonly, E_FAIL);
 
     aMediumLockList = NULL;

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

@@ -8393 +8393 @@
   <enum
     name="MediumType"
-    uuid="46bf1fd4-ad86-4ded-8c49-28bd2d148e5a"
+    uuid="19388a99-8e70-4bd4-9a95-90cbc513ef6d"
    >
     <desc>
@@ -8422 +8422 @@
         Allow using this medium concurrently by several machines.
         <note>Present since VirtualBox 3.2.0, and accepted since 3.2.8.</note>
+      </desc>
+    </const>
+    <const name="Readonly"          value="4">
+      <desc>
+        A readonly medium, which can of course be used by several machines.
+        <note>Present and accepted since VirtualBox 4.0.</note>
       </desc>
     </const>