Changeset 45563 in vbox for trunk/src

Timestamp:

Apr 16, 2013 11:13:16 AM (12 years ago)

Author:

vboxsync

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

85054

Message:

Main: Make SilentReconfigureWhilePaused a per VM flag

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (3 diffs)

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

@@ -925 +925 @@
     HRESULT deleteTaskWorker(DeleteTask &task);
 
+    Utf8Str getExtraData(const Utf8Str &strKey);
+
 #ifdef VBOX_WITH_GUEST_PROPS
     HRESULT getGuestPropertyFromService(IN_BSTR aName, BSTR *aValue,

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

@@ -3776 +3776 @@
 
     bool fSilent = false;
-    Bstr strReconfig;
+    Utf8Str strReconfig;
 
     /* Check whether the flag to allow silent storage attachment reconfiguration is set. */
-    rc = mParent->GetExtraData(Bstr("StorageMgmt/SilentReconfigureWhilePaused").raw(), strReconfig.asOutParam());
+    strReconfig = getExtraData(Utf8Str("VBoxInternal2/SilentReconfigureWhilePaused"));
     if (FAILED(rc))
         return rc;
@@ -4226 +4226 @@
 
     bool fSilent = false;
-    Bstr strReconfig;
+    Utf8Str strReconfig;
 
     /* Check whether the flag to allow silent storage attachment reconfiguration is set. */
-    rc = mParent->GetExtraData(Bstr("StorageMgmt/SilentReconfigureWhilePaused").raw(), strReconfig.asOutParam());
+    strReconfig = getExtraData(Utf8Str("VBoxInternal2/SilentReconfigureWhilePaused"));
     if (FAILED(rc))
         return rc;
@@ -7878 +7878 @@
         }
     }
+}
+
+Utf8Str Machine::getExtraData(const Utf8Str &strKey)
+{
+    /* start with nothing found */
+    Utf8Str strResult("");
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    settings::StringsMap::const_iterator it = mData->pMachineConfigFile->mapExtraDataItems.find(strKey);
+    if (it != mData->pMachineConfigFile->mapExtraDataItems.end())
+        // found:
+        strResult = it->second; // source is a Utf8Str
+
+    return strResult;
 }