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

Timestamp:

Apr 9, 2010 3:43:44 PM (15 years ago)

Author:

vboxsync

Message:

Main/OVF: write vbox:uuid attribute for each disk on export

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplExport.cpp (modified) (3 diffs)
• SnapshotImpl.cpp (modified) (1 diff)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -635 +635 @@
 
 /**
+ * Called from Appliance::writeFS() for each virtual system (machine) that needs XML written out.
  *
- * @param vsdescThis
+ * @param elmToAddVirtualSystemsTo XML element to append elements to.
+ * @param vsdescThis The IVirtualSystemDescription instance for which to write XML.
+ * @param enFormat OVF format (0.9 or 1.0).
+ * @param stack Structure for temporary private data shared with caller.
  */
 void Appliance::buildXMLForOneVirtualSystem(xml::ElementNode &elmToAddVirtualSystemsTo,
@@ -1420 +1424 @@
             if (FAILED(rc)) throw rc;
 
-            /* We are always exporting to vmdfk stream optimized for now */
+            Bstr uuidSource;
+            rc = pSourceDisk->COMGETTER(Id)(uuidSource.asOutParam());
+            if (FAILED(rc)) throw rc;
+            Guid guidSource(uuidSource);
+
+            // We are always exporting to VMDK stream optimized for now
             Bstr bstrSrcFormat = L"VMDK";
 
@@ -1483 +1492 @@
             pelmDisk->setAttribute("ovf:fileRef", strFileRef);
             pelmDisk->setAttribute("ovf:format", "http://www.vmware.com/specifications/vmdk.html#sparse");      // must be sparse or ovftool chokes
+            pelmDisk->setAttribute("vbox:uuid", Utf8StrFmt("%RTuuid", guidSource.raw()).c_str());
         }
 

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -782 +782 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (SnapshotMachine)
+DEFINE_EMPTY_CTOR_DTOR(SnapshotMachine)
 
 HRESULT SnapshotMachine::FinalConstruct()

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

@@ -93 +93 @@
 
 public:
-
-//     enum InitMode { Init_New, Init_Import, Init_Registered };
 
     enum StateDependency