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

Timestamp:

Aug 9, 2010 12:02:47 PM (15 years ago)

Author:

vboxsync

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

64561

Message:

Main: add registry machine methods

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (5 diffs)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -103 +103 @@
           numCreateDiffTasks(0),
           vdDiskIfaces(NULL)
-    {}
+    { }
 
     /** weak VirtualBox parent */
     VirtualBox * const pVirtualBox;
+
+    // pParent and llChildren are protected by VirtualBox::getMediaTreeLockHandle()
+    ComObjPtr<Medium> pParent;
+    MediaList llChildren;           // to add a child, just call push_back; to remove a child, call child->deparent() which does a lookup
+
+    Guid uuidRegistryMachine;       // machine in whose registry this medium is listed or NULL; see getRegistryMachine()
 
     const Guid id;
@@ -117 +123 @@
     Utf8Str strLastAccessError;
 
-    // pParent and llChildren are protected by VirtualBox::getMediaTreeLockHandle()
-    ComObjPtr<Medium> pParent;
-    MediaList llChildren;           // to add a child, just call push_back; to remove a child, call child->deparent() which does a lookup
-
     BackRefList backRefs;
 
@@ -148 +150 @@
     bool hostDrive : 1;
 
-    typedef std::map <Bstr, Bstr> PropertyMap;
+    typedef std::map<Bstr, Bstr> PropertyMap;
     PropertyMap properties;
 
@@ -986 +988 @@
      * XML format version change if we wish) */
     for (settings::PropertiesMap::const_iterator it = data.properties.begin();
-         it != data.properties.end(); ++it)
+         it != data.properties.end();
+         ++it)
     {
         const Utf8Str &name = it->first;
@@ -2575 +2578 @@
 {
     return m->llChildren;
+}
+
+/**
+ * Internal method to return the medium's registry machine (i.e. the machine in whose
+ * machine XML this medium is listed), or NULL if the medium is registered globally.
+ *
+ * Must have caller + locking!
+ *
+ * @return
+ */
+const Guid& Medium::getRegistryMachineId() const
+{
+    return m->uuidRegistryMachine;
 }
 

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

@@ -163 +163 @@
     const MediaList& getChildren() const;
 
+    const Guid& getRegistryMachineId() const;
+
     const Guid& getId() const;
     MediumState_T getState() const;