儲存庫 vbox 的更動 18214

時間撮記:

2009-3-24 下午06:30:04 (16 年 以前)

作者:

vboxsync

訊息:

OVF: added AddDescription; return the created VirtualSystemDescription after an export call; write the EULA section to the OVF

位置:

trunk/src/VBox

檔案:

• Frontends/VBoxManage/VBoxManageImport.cpp (修改) (1 筆差異)
• Frontends/VirtualBox/src/VBoxExportApplianceWzd.cpp (修改) (1 筆差異)
• Main/ApplianceImpl.cpp (修改) (4 筆差異)
• Main/idl/VirtualBox.xidl (修改) (4 筆差異)
• Main/include/ApplianceImpl.h (修改) (1 筆差異)
• Main/include/MachineImpl.h (修改) (1 筆差異)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -605 +605 @@
         {
             ComPtr<IMachine> pMachine = *itM;
-            CHECK_ERROR_BREAK(pMachine, Export(pAppliance));
+            ComPtr<IVirtualSystemDescription> pVSD;
+            CHECK_ERROR_BREAK(pMachine, Export(pAppliance, pVSD.asOutParam()));
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxExportApplianceWzd.cpp

@@ -256 +256 @@
             {
                 /* Add the export description to our appliance object */
-                m.Export (aAppliance);
+                CVirtualSystemDescription vsd = m.Export (aAppliance);
                 fResult = m.isOk();
                 if (!fResult)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2657 +2657 @@
             }
 
+            // license
+            std::list<VirtualSystemDescriptionEntry*> llLicense = vsdescThis->findByType(VirtualSystemDescriptionType_License);
+            if (llLicense.size())
+            {
+                /* <EulaSection>
+                   <Info ovf:msgid="6">License agreement for the Virtual System.</Info>
+                   <License ovf:msgid="1">License terms can go in here.</License>
+                   </EulaSection> */
+                xml::ElementNode *pelmAnnotationSection = pelmVirtualSystem->createChild("EulaSection");
+                pelmAnnotationSection->createChild("Info")->addContent("License agreement for the Virtual System.");
+                pelmAnnotationSection->createChild("License")->addContent(llLicense.front()->strVbox);
+            }
+
             // operating system
             std::list<VirtualSystemDescriptionEntry*> llOS = vsdescThis->findByType(VirtualSystemDescriptionType_OS);
@@ -3517 +3530 @@
 
 /**
+ * Public method implementation.
+ * @return
+ */
+STDMETHODIMP VirtualSystemDescription::AddDescription(VirtualSystemDescriptionType_T aType,
+                                                      IN_BSTR aVboxValue,
+                                                      IN_BSTR aExtraConfigValue)
+{
+    CheckComArgNotNull(aVboxValue);
+    CheckComArgNotNull(aExtraConfigValue);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    addEntry(aType, "", aVboxValue, aVboxValue, aExtraConfigValue);
+
+    return S_OK;
+}
+
+/**
  * Internal method; adds a new description item to the member list.
  * @param aType Type of description for the new item.
@@ -3608 +3642 @@
 */
 
-STDMETHODIMP Machine::Export(IAppliance *appliance)
+STDMETHODIMP Machine::Export(IAppliance *aAppliance, IVirtualSystemDescription **aDescription)
 {
     HRESULT rc = S_OK;
 
-    if (!appliance)
+    if (!aAppliance)
         return E_POINTER;
 
@@ -3956 +3990 @@
 
         // finally, add the virtual system to the appliance
-        Appliance *pAppliance = static_cast<Appliance*>(appliance);
+        Appliance *pAppliance = static_cast<Appliance*>(aAppliance);
         AutoCaller autoCaller(pAppliance);
         if (FAILED(rc)) throw rc;
+
+        /* We return the new description to the caller */
+        ComPtr<IVirtualSystemDescription> copy(pNewDesc);
+        copy.queryInterfaceTo(aDescription);
 
         AutoWriteLock alock(pAppliance);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3297 +3297 @@
   <interface
      name="IVirtualSystemDescription" extends="$unknown"
-     uuid="c2e9f5b5-522c-47e5-be55-0d20b46a95d9"
+     uuid="d7525e6c-531a-4c51-8e04-41235083a3d8"
      wsmap="managed"
      >
@@ -3504 +3504 @@
       </param>
     </method>
+
+    <method name="addDescription">
+      <desc>
+      This method adds an additional description entry to the stack of already
+      available descriptions for this virtual system. This is handy for writing
+      values which aren't directly supported by VirtualBox. One example would
+      be the License type of <link to="VirtualSystemDescriptionType" />.
+      </desc>
+
+      <param name="aType" type="VirtualSystemDescriptionType" dir="in">
+        <desc></desc>
+      </param>
+
+      <param name="aVboxValue" type="wstring" dir="in">
+        <desc></desc>
+      </param>
+
+      <param name="aExtraConfigValue" type="wstring" dir="in">
+        <desc></desc>
+      </param>
+    </method>
   </interface>
 
@@ -3941 +3962 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="dcf6a64c-1466-4b5a-b822-9db04133dc74"
+     uuid="13420cbb-175a-4456-85d0-301126dfdec7"
      wsmap="managed"
      >
@@ -5054 +5075 @@
         </desc>
 
-        <param name="appliance" type="IAppliance" dir="in">
+        <param name="aAppliance" type="IAppliance" dir="in">
             <desc>Appliance to export this machine to.</desc>
+        </param>
+        <param name="aDescription" type="IVirtualSystemDescription" dir="return">
+            <desc>VirtualSystemDescription object which is created for this machine.</desc>
         </param>
     </method >

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

@@ -177 +177 @@
                               ComSafeArrayIn(IN_BSTR, aExtraConfigValues));
 
+    STDMETHOD(AddDescription)(VirtualSystemDescriptionType_T aType,
+                              IN_BSTR aVboxValue,
+                              IN_BSTR aExtraConfigValue);
+
     /* public methods only for internal purposes */
 

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

@@ -554 +554 @@
     STDMETHOD(DiscardSettings)();
     STDMETHOD(DeleteSettings)();
-    STDMETHOD(Export)(IAppliance *appliance);
+    STDMETHOD(Export)(IAppliance *aAppliance, IVirtualSystemDescription **aDescription);
     STDMETHOD(GetSnapshot) (IN_GUID aId, ISnapshot **aSnapshot);
     STDMETHOD(FindSnapshot) (IN_BSTR aName, ISnapshot **aSnapshot);