Changeset 44409 in vbox for trunk/src

Timestamp:

Jan 28, 2013 9:56:52 AM (12 years ago)

Author:

vboxsync

Message:

Main/Medium: resizing needs to update the image size information, and finally rip out the useless and weird logic which always returned the capacity for the base medium for all diff images,

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• src-server/MediumImpl.cpp (modified) (5 diffs)

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

@@ -12451 +12451 @@
 
         <note>
-          Reading this property on a differencing medium will return the size
-          of its <link to="#base"/> medium.
-        </note>
-        <note>
           For media whose state is <link to="#state"/> is <link
           to="MediumState_Inaccessible"/>, the value of this property is the

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -1894 +1894 @@
     CheckComArgOutPointerValid(aLogicalSize);
 
-    {
-        AutoCaller autoCaller(this);
-        if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-        /* we access mParent */
-        AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
-
-        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-        if (m->pParent.isNull())
-        {
-            *aLogicalSize = m->logicalSize;
-
-            return S_OK;
-        }
-    }
-
-    /* We assume that some backend may decide to return a meaningless value in
-     * response to VDGetSize() for differencing media and therefore always
-     * ask the base medium ourselves. */
-
-    /* base() will do callers/locking */
-
-    return getBase()->COMGETTER(LogicalSize)(aLogicalSize);
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aLogicalSize = m->logicalSize;
+
+    return S_OK;
 }
 
@@ -5741 +5725 @@
                 else
                 {
-                     Assert(!mediumId.isZero());
+                    Assert(!mediumId.isZero());
 
                     if (mediumId != uuid)
@@ -7993 +7977 @@
     HRESULT rc = S_OK;
 
-    /* Lock all in {parent,child} order. The lock is also used as a
-     * signal from the task initiator (which releases it only after
-     * RTThreadCreate()) that we can start the job. */
-    AutoWriteLock thisLock(this COMMA_LOCKVAL_SRC_POS);
+    uint64_t size = 0, logicalSize = 0;
 
     try
     {
+        /* The lock is also used as a signal from the task initiator (which
+         * releases it only after RTThreadCreate()) that we can start the job */
+        AutoWriteLock thisLock(this COMMA_LOCKVAL_SRC_POS);
+
         PVBOXHDD hdd;
         int vrc = VDCreate(m->vdDiskIfaces, convertDeviceType(), &hdd);
@@ -8068 +8053 @@
                                    vdError(vrc).c_str());
             }
+            size = VDGetFileSize(hdd, VD_LAST_IMAGE);
+            logicalSize = VDGetSize(hdd, VD_LAST_IMAGE);
         }
         catch (HRESULT aRC) { rc = aRC; }
@@ -8074 +8061 @@
     }
     catch (HRESULT aRC) { rc = aRC; }
+
+    if (SUCCEEDED(rc))
+    {
+        AutoWriteLock thisLock(this COMMA_LOCKVAL_SRC_POS);
+        m->size = size;
+        m->logicalSize = logicalSize;
+    }
 
     /* Everything is explicitly unlocked when the task exits,