Changeset 14698 in vbox for trunk/src/VBox

Timestamp:

Nov 27, 2008 12:04:44 PM (16 years ago)

Author:

vboxsync

Message:

Main: HardDisks: Added saving/loading properties from XML.

Location:

trunk/src/VBox/Main

Files:

• HardDisk2Impl.cpp (modified) (7 diffs)
• testcase/tstAPI.cpp (modified) (1 diff)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -626 +626 @@
     CheckComRCReturnRC (rc);
 
+    /* properties (note: after setting the format as it populates the map) */
+    Key::List properties = aNode.keys ("Property");
+    for (Key::List::const_iterator it = properties.begin();
+         it != properties.end(); ++ it)
+    {
+        mm.properties [Bstr (it->stringValue ("name"))] =
+            Bstr (it->stringValue ("value"));
+    }
+
     /* required */
     Bstr location = aNode.stringValue ("location");
@@ -947 +956 @@
     CheckComArgStrNotEmptyOrNull (aName);
 
-    AutoWriteLock alock (this);
+    /* VirtualBox::saveSettings() needs a write lock */
+    AutoMultiWriteLock2 alock (mVirtualBox, this);
+
+    switch (m.state)
+    {
+        case MediaState_Created:
+        case MediaState_Inaccessible:
+            break;
+        default:
+            return setStateError();
+    }
 
     Data::PropertyMap::iterator it = mm.properties.find (Bstr (aName));
@@ -956 +975 @@
     it->second = aValue;
 
-    return S_OK;
+    HRESULT rc = mVirtualBox->saveSettings();
+
+    return rc;
 }
 
@@ -970 +991 @@
 
     AutoReadLock alock (this);
+
+    /// @todo make use of aNames according to the documentation
+    NOREF (aNames);
 
     com::SafeArray <BSTR> names (mm.properties.size());
@@ -1339 +1363 @@
         Key descNode = diskNode.createKey ("Description");
         descNode.setKeyValue <Bstr> (m.description);
+    }
+
+    /* optional properties */
+    for (Data::PropertyMap::const_iterator it = mm.properties.begin();
+         it != mm.properties.end(); ++ it)
+    {
+        /* only save properties that have non-default values */
+        if (!it->second.isNull())
+        {
+            Key propNode = diskNode.appendKey ("Property");
+            propNode.setValue <Bstr> ("name", it->first);
+            propNode.setValue <Bstr> ("value", it->second);
+        }
     }
 
@@ -2330 +2367 @@
                   E_FAIL);
 
-    /* are we dealing with a hard disk opened from the existing path? */
+    /* are we dealing with a hard disk just opened from the existing path? */
     bool isNew = mm.format.isNull();
 
@@ -2479 +2516 @@
          * properties is meant to be constant. */
 
-        mm.properties.clear();
+        Assert (mm.properties.empty());
 
         for (HardDiskFormat::PropertyList::const_iterator it =

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -641 +641 @@
                     printf (" <none>\n");
 
+                Bstr name ("TargetAddress");
+                Bstr value = Utf8StrFmt ("lalala (%llu)", RTTimeMilliTS());
+
+                printf ("Settings property %ls to %ls...\n", name.raw(), value.raw());
+                CHECK_ERROR (hd, SetProperty (name, value));
             }
             else

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -261 +261 @@
   <xsd:sequence>
     <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
+    <xsd:element name="Property" minOccurs="0" maxOccurs="unbounded">
+      <xsd:complexType>
+        <xsd:attribute name="name" type="xsd:token" use="required"/>
+        <xsd:attribute name="value" type="xsd:string" use="required"/>
+      </xsd:complexType>
+    </xsd:element>
     <xsd:element name="HardDisk" type="TDiffHardDisk2" minOccurs="0" maxOccurs="unbounded"/>
   </xsd:sequence>