Changeset 78565 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 17, 2019 12:06:36 PM (6 years ago)

Author:

vboxsync

Message:

Main: bugref:6913: Fixed NULL id in the IMediumRegisteredEvent and fixed generation other medium and storage device events

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (4 diffs)
• MediumImpl.cpp (modified) (4 diffs)
• SnapshotImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -4337 +4337 @@
                         tr("Setting passthrough rejected as the device attached to device slot %d on port %d of controller '%s' is not a DVD"),
                         aDevice, aControllerPort, aName.c_str());
+
+    bool fValueChanged = pAttach->i_getPassthrough() != (aPassthrough != 0);
+
     pAttach->i_updatePassthrough(!!aPassthrough);
 
@@ -4342 +4345 @@
     alock.release();
     rc = i_onStorageDeviceChange(pAttach, FALSE /* aRemove */, FALSE /* aSilent */);
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(rc) && fValueChanged)
         mParent->i_onStorageDeviceChanged(pAttach, FALSE, FALSE);
 
@@ -6157 +6160 @@
     if (FAILED(rc)) return rc;
 
+    MediumAttachmentList llDetachedAttachments;
     {
         /* find all attached devices to the appropriate storage controller and detach them all */
@@ -6177 +6181 @@
             if (pAttachTemp->i_getControllerName() == aName)
             {
+                llDetachedAttachments.push_back(pAttachTemp);
                 rc = i_detachDevice(pAttachTemp, alock, NULL);
                 if (FAILED(rc)) return rc;
             }
         }
+    }
+
+    /* send event about detached devices before removing parent controller */
+    for (MediumAttachmentList::const_iterator
+         it = llDetachedAttachments.begin();
+         it != llDetachedAttachments.end();
+         ++it)
+    {
+        mParent->i_onStorageDeviceChanged(*it, TRUE, FALSE);
     }
 

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

@@ -2336 +2336 @@
     pVirtualBox->i_saveModifiedRegistries();
 
-    if (SUCCEEDED(mrc))
+    if (SUCCEEDED(mrc) && uId.isValid() && !uId.isZero())
         pVirtualBox->i_onMediumRegistered(uId, devType, FALSE);
 
@@ -8414 +8414 @@
 
     if (task.NotifyAboutChanges() && SUCCEEDED(rc))
+    {
         m->pVirtualBox->i_onMediumConfigChanged(this);
+        m->pVirtualBox->i_onMediumRegistered(m->id, m->devType, TRUE);
+    }
 
     return rc;
@@ -8641 +8644 @@
 
     if (task.NotifyAboutChanges() && SUCCEEDED(mrc))
+    {
         m->pVirtualBox->i_onMediumConfigChanged(this);
+        m->pVirtualBox->i_onMediumRegistered(m->id, m->devType, TRUE);
+    }
 
     return mrc;
@@ -9650 +9656 @@
 
     /* Reset UUID to prevent Create* from reusing it again */
+    com::Guid uOldId = m->id;
     unconst(m->id).clear();
 
-    if (task.NotifyAboutChanges() && SUCCEEDED(rc) && m->pParent.isNotNull())
-        m->pVirtualBox->i_onMediumConfigChanged(m->pParent);
+    if (task.NotifyAboutChanges() && SUCCEEDED(rc))
+    {
+        if (m->pParent.isNotNull())
+            m->pVirtualBox->i_onMediumConfigChanged(m->pParent);
+        m->pVirtualBox->i_onMediumRegistered(uOldId, m->devType, TRUE);
+    }
 
     return rc;

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

@@ -3234 +3234 @@
                     else
                     {
-                        for (ComObjPtr<Medium> pTmpMedium = it->mpSource->i_getParent();
+                        for (ComObjPtr<Medium> pTmpMedium = it->mpSource;
                              pTmpMedium && pTmpMedium != it->mpTarget;
                              pTmpMedium = pTmpMedium->i_getParent())

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

@@ -1978 +1978 @@
     {
         medium.queryInterfaceTo(aMedium.asOutParam());
-        i_onMediumRegistered(medium->i_getId(), medium->i_getDeviceType(), TRUE);
+        com::Guid uMediumId = medium->i_getId();
+        if (uMediumId.isValid() && !uMediumId.isZero())
+            i_onMediumRegistered(uMediumId, medium->i_getDeviceType(), TRUE);
     }