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

Timestamp:

Jun 15, 2016 1:15:10 PM (9 years ago)

Author:

vboxsync

Message:

Main/MediumAttachment: Update the medium attachment log tag string whenever necessary and add some paranoia checks to catch if someone tries to change attachment settings of a snapshot.

Location:

trunk/src/VBox/Main

Files:

• include/MediumAttachmentImpl.h (modified) (2 diffs)
• src-server/MediumAttachmentImpl.cpp (modified) (17 diffs)

trunk/src/VBox/Main/include/MediumAttachmentImpl.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -101 +101 @@
     void i_updateHotPluggable(bool aHotPluggable);
 
+    /** Construct a unique and somewhat descriptive name for logging. */
+    void i_updateLogName(void);
+
     /** Get a unique and somewhat descriptive name for logging. */
-    const char* i_getLogName(void) const { return mLogName.c_str(); }
+    const char *i_getLogName(void) const { return mLogName.c_str(); }
 
 private:

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

@@ -130 +130 @@
     m->bd->mData.strBwGroup = strBandwidthGroup;
     unconst(m->bd->strControllerName) = aControllerName;
-    m->bd->mData.lPort   = aPort;
+    m->bd->mData.lPort = aPort;
     m->bd->mData.lDevice = aDevice;
-    m->bd->mData.deviceType    = aType;
+    m->bd->mData.deviceType = aType;
 
     m->bd->mData.fPassThrough = aPassthrough;
@@ -145 +145 @@
 
     /* Construct a short log name for this attachment. */
-    Utf8Str ctlName(aControllerName);
-    const char *psz = strpbrk(ctlName.c_str(), " \t:-");
-    mLogName = Utf8StrFmt("MA%p[%.*s:%u:%u:%s%s]",
-                          this,
-                          psz ? psz - ctlName.c_str() : 4, ctlName.c_str(),
-                          aPort, aDevice, Global::stringifyDeviceType(aType),
-                          m->bd->fImplicit ? ":I" : "");
+    i_updateLogName();
 
     LogFlowThisFunc(("LEAVE - %s\n", i_getLogName()));
@@ -167 +161 @@
 
     ComAssertRet(aParent && aThat, E_INVALIDARG);
+    Assert(!aParent->i_isSnapshotMachine());
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -184 +179 @@
     autoInitSpan.setSucceeded();
 
+    /* Construct a short log name for this attachment. */
+    i_updateLogName();
+
+    LogFlowThisFunc(("LEAVE - %s\n", i_getLogName()));
     return S_OK;
 }
@@ -399 +398 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -416 +415 @@
 void MediumAttachment::i_setImplicit(bool aImplicit)
 {
+    Assert(!m->pMachine->i_isSnapshotMachine());
     m->bd->fImplicit = aImplicit;
+
+    /* Construct a short log name for this attachment. */
+    i_updateLogName();
 }
 
@@ -490 +493 @@
 {
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->bd.backup();
     unconst(m->bd->strControllerName) = aName;
+
+    /* Construct a short log name for this attachment. */
+    i_updateLogName();
 }
 
@@ -502 +509 @@
 {
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->bd.backup();
@@ -513 +521 @@
 {
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->bd.backup();
@@ -522 +531 @@
 {
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->bd.backup();
@@ -531 +541 @@
 {
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->fIsEjected = true;
@@ -539 +550 @@
 {
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->bd.backup();
@@ -548 +560 @@
 {
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->bd.backup();
@@ -557 +570 @@
 {
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->bd.backup();
@@ -566 +580 @@
     LogFlowThisFuncEnter();
     Assert(isWriteLockOnCurrentThread());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     m->bd.backup();
@@ -578 +593 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
+    Assert(!m->pMachine->i_isSnapshotMachine());
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -587 +603 @@
 }
 
+void MediumAttachment::i_updateLogName()
+{
+    const char *pszName = m->bd->strControllerName.c_str();
+    const char *pszEndNick = strpbrk(pszName, " \t:-");
+    mLogName = Utf8StrFmt("MA%p[%.*s:%u:%u:%s%s]",
+                          this,
+                          pszEndNick ? pszEndNick - pszName : 4, pszName,
+                          m->bd->mData.lPort, m->bd->mData.lDevice, Global::stringifyDeviceType(m->bd->mData.deviceType),
+                          m->bd->fImplicit ? ":I" : "");
+}