Changeset 33458 in vbox

Timestamp:

Oct 26, 2010 11:18:04 AM (15 years ago)

Author:

vboxsync

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

67049

Message:

Main: partial revert or r67042, bring back the overwrite parameter

Location:

trunk

Files:

• doc/manual/en_US/SDKRef.xml (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (2 diffs)
• src/VBox/Main/ApplianceImplImport.cpp (modified) (1 diff)
• src/VBox/Main/MachineImpl.cpp (modified) (6 diffs)
• src/VBox/Main/VirtualBoxImpl.cpp (modified) (2 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (2 diffs)
• src/VBox/Main/include/VirtualBoxImpl.h (modified) (1 diff)
• src/VBox/Main/testcase/tstVBoxAPILinux.cpp (modified) (1 diff)

trunk/doc/manual/en_US/SDKRef.xml

@@ -3446 +3446 @@
           to creating machines in the default "Machines" folder, but can now
           create machines at arbitrary locations. For this to work, the
-          parameter list had to be changed. The "Override" parameter has been
-          removed since the target files can now be known before the call and
-          the caller can remove the files in question.</para>
+          parameter list had to be changed.</para>
         </listitem>
 

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

@@ -244 +244 @@
                                         osTypeId.raw(),
                                         Guid(id).toUtf16().raw(),
+                                        FALSE /* forceOverwrite */,
                                         machine.asOutParam()));
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -647 +647 @@
                                        field("name").toString(),
                                        typeId,
-                                       QString::null);      // machine ID
+                                       QString::null,       // machine ID
+                                       false);              // forceOverwrite
         if (!vbox.isOk())
         {
@@ -659 +660 @@
             m_Machine.SetExtraData(VBoxDefs::GUI_FirstRun, "yes");
     }
-
 
     /* RAM size */

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -1820 +1820 @@
                                     Bstr(stack.strOsTypeVBox).raw(),
                                     NULL, /* uuid */
+                                    FALSE, /* fForceOverwrite */
                                     pNewMachine.asOutParam());
     if (FAILED(rc)) throw rc;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -253 +253 @@
  *  @param strName      name for the machine
  *  @param aId          UUID for the new machine.
- *  @param aOsType      Optional OS Type of this machine.
+ *  @param aOsType      OS Type of this machine or NULL.
+ *  @param fForceOverwrite Whether to overwrite an existing machine settings file.
  *
  *  @return  Success indicator. if not S_OK, the machine object is invalid
@@ -260 +261 @@
                       const Utf8Str &strConfigFile,
                       const Utf8Str &strName,
+                      GuestOSType *aOsType,
                       const Guid &aId,
-                      GuestOSType *aOsType /* = NULL */)
+                      bool fForceOverwrite)
 {
     LogFlowThisFuncEnter();
@@ -273 +275 @@
     if (FAILED(rc)) return rc;
 
-    rc = tryCreateMachineConfigFile();
+    rc = tryCreateMachineConfigFile(fForceOverwrite);
     if (FAILED(rc)) return rc;
 
@@ -473 +475 @@
     if (FAILED(rc)) return rc;
 
-    rc = tryCreateMachineConfigFile();
+    rc = tryCreateMachineConfigFile(false /* fForceOverwrite */);
     if (FAILED(rc)) return rc;
 
@@ -569 +571 @@
  * @return
  */
-HRESULT Machine::tryCreateMachineConfigFile()
+HRESULT Machine::tryCreateMachineConfigFile(bool fForceOverwrite)
 {
     HRESULT rc = S_OK;
@@ -582 +584 @@
         if (RT_SUCCESS(vrc))
             RTFileClose(f);
-        rc = setError(VBOX_E_FILE_ERROR,
-                      tr("Machine settings file '%s' already exists"),
-                      mData->m_strConfigFileFull.c_str());
+        if (!fForceOverwrite)
+            rc = setError(VBOX_E_FILE_ERROR,
+                          tr("Machine settings file '%s' already exists"),
+                          mData->m_strConfigFileFull.c_str());
+        else
+        {
+            /* try to delete the config file, as otherwise the creation
+             * of a new settings file will fail. */
+            int vrc2 = RTFileDelete(mData->m_strConfigFileFull.c_str());
+            if (RT_FAILURE(vrc2))
+                rc = setError(VBOX_E_FILE_ERROR,
+                              tr("Could not delete the existing settings file '%s' (%Rrc)"),
+                              mData->m_strConfigFileFull.c_str(), vrc2);
+        }
     }
     else if (    vrc != VERR_FILE_NOT_FOUND

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1198 +1198 @@
                                        IN_BSTR aOsTypeId,
                                        IN_BSTR aId,
+                                       BOOL forceOverwrite,
                                        IMachine **aMachine)
 {
@@ -1239 +1240 @@
                        Utf8Str(bstrSettingsFile),
                        Utf8Str(aName),
+                       osType,
                        id,
-                       osType);
+                       !!forceOverwrite);
     if (SUCCEEDED(rc))
     {

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

@@ -1374 +1374 @@
   <interface
     name="IVirtualBox" extends="$unknown"
-    uuid="4bbb7840-f46a-4672-90e2-c4bf65c3c74c"
+    uuid="6e123115-af60-49b3-9727-d3f302306cd2"
     wsmap="managed"
   >
@@ -1657 +1657 @@
       <param name="id" type="uuid" mod="string" dir="in">
         <desc>Machine UUID (optional).</desc>
+      </param>
+      <param name="forceOverwrite" type="boolean" dir="in">
+        <desc>If true, an existing machine settings file will be overwritten.</desc>
       </param>
       <param name="machine" type="IMachine" dir="return">

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

@@ -332 +332 @@
                  const Utf8Str &strConfigFile,
                  const Utf8Str &strName,
+                 GuestOSType *aOsType,
                  const Guid &aId,
-                 GuestOSType *aOsType = NULL);
+                 bool fForceOverwrite);
 
     // initializer for loading existing machine XML (either registered or not)
@@ -357 +358 @@
     HRESULT initDataAndChildObjects();
     HRESULT registeredInit();
-    HRESULT tryCreateMachineConfigFile();
+    HRESULT tryCreateMachineConfigFile(bool fForceOverwrite);
     void uninitDataAndChildObjects();
 

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

@@ -127 +127 @@
                               IN_BSTR aOsTypeId,
                               IN_BSTR aId,
+                              BOOL forceOverwrite,
                               IMachine **aMachine);
     STDMETHOD(OpenMachine) (IN_BSTR aSettingsFile, IMachine **aMachine);

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

@@ -190 +190 @@
      */
     nsCOMPtr<IMachine> machine;
-    rc = virtualBox->CreateMachine(NULL,
+    rc = virtualBox->CreateMachine(NULL,        /* settings file */
                                    NS_LITERAL_STRING("A brand new name").get(),
-                                   nsnull,
-                                   false,
+                                   nsnull,      /* ostype */
+                                   nsnull,      /* machine uuid */
+                                   false,       /* forceOverwrite */
                                    getter_AddRefs(machine));
     if (NS_FAILED(rc))