Changeset 27792 in vbox

Timestamp:

Mar 29, 2010 1:08:44 PM (15 years ago)

Author:

vboxsync

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

59446

Message:

Main/VirtualBox: new parameter for overriding VM file existence check on creation (2nd try)

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)
• Main/ApplianceImpl.cpp (modified) (2 diffs)
• Main/MachineImpl.cpp (modified) (3 diffs)
• Main/VirtualBoxImpl.cpp (modified) (5 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/MachineImpl.h (modified) (1 diff)
• Main/include/VirtualBoxImpl.h (modified) (2 diffs)
• Main/testcase/tstAPI.cpp (modified) (2 diffs)
• Main/testcase/tstVBoxAPILinux.cpp (modified) (2 diffs)

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

@@ -247 +247 @@
         if (settingsFile.isEmpty())
             CHECK_ERROR_BREAK(a->virtualBox,
-                CreateMachine(name, osTypeId, baseFolder, Guid(id).toUtf16(), machine.asOutParam()));
+                CreateMachine(name, osTypeId, baseFolder, Guid(id).toUtf16(), FALSE, machine.asOutParam()));
         else
             CHECK_ERROR_BREAK(a->virtualBox,

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

@@ -636 +636 @@
     if (m_Machine.isNull())
     {
-        m_Machine = vbox.CreateMachine(field("name").toString(), typeId, QString::null, QString::null);
+        m_Machine = vbox.CreateMachine(field("name").toString(), typeId, QString::null, QString::null, false);
         if (!vbox.isOk())
         {

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1278 +1278 @@
             const Utf8Str &strNameVBox = vsdeName.front()->strVbox;
             rc = mVirtualBox->CreateMachine(Bstr(strNameVBox), Bstr(strOsTypeVBox),
-                                                 Bstr(), Bstr(),
+                                                 Bstr(), Bstr(), FALSE,
                                                  pNewMachine.asOutParam());
             if (FAILED(rc)) throw rc;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -267 +267 @@
  *                      (ignored otherwise)
  *  @param aOsType      OS Type of this machine
+ *  @param aOverride    |TRUE| to override VM config file existence checks.
+ *                      |FALSE| refuses to overwrite existing VM configs.
  *  @param aNameSync    |TRUE| to automatically sync settings dir and file
  *                      name with the machine name. |FALSE| is used for legacy
@@ -285 +287 @@
                       CBSTR aName /* = NULL */,
                       GuestOSType *aOsType /* = NULL */,
+                      BOOL aOverride /* = FALSE */,
                       BOOL aNameSync /* = TRUE */,
                       const Guid *aId /* = NULL */)
@@ -352 +355 @@
                )
             {
-                rc = setError(VBOX_E_FILE_ERROR,
-                              tr("Machine settings file '%s' already exists"),
-                              mData->m_strConfigFileFull.raw());
+                if (!aOverride)
+                {
+                    rc = setError(VBOX_E_FILE_ERROR,
+                                  tr("Machine settings file '%s' already exists"),
+                                  mData->m_strConfigFileFull.raw());
+                }
                 if (RT_SUCCESS(vrc))
                     RTFileClose(f);

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -516 +516 @@
                                 NULL,
                                 NULL,
+                                FALSE, /* aOverride */
                                 FALSE, /* aNameSync */
                                 &uuid);
@@ -1031 +1032 @@
                                        IN_BSTR aBaseFolder,
                                        IN_BSTR aId,
+                                       BOOL aOverride,
                                        IMachine **aMachine)
 {
@@ -1084 +1086 @@
                        aName,
                        osType,
+                       aOverride,
                        TRUE /* aNameSync */,
                        &id);
@@ -1139 +1142 @@
                        aName,
                        osType,
+                       FALSE /* aOverride */,
                        FALSE /* aNameSync */,
                        &id);

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

@@ -1690 +1690 @@
   <interface
     name="IVirtualBox" extends="$dispatched"
-    uuid="2158464a-f706-414b-a8c4-fb589dfc6b62"
+    uuid="3f36e024-7fed-4f20-a02c-9158a82b44e6"
     wsmap="managed"
   >
@@ -1919 +1919 @@
       <param name="id" type="uuid" mod="string" dir="in">
         <desc>Machine UUID (optional).</desc>
+      </param>
+      <param name="override" type="boolean" dir="in">
+        <desc>Create the VM even if there are conflicting files.</desc>
       </param>
       <param name="machine" type="IMachine" dir="return">

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

@@ -355 +355 @@
                  CBSTR aName = NULL,
                  GuestOSType *aOsType = NULL,
+                 BOOL aOverride = FALSE,
                  BOOL aNameSync = TRUE,
                  const Guid *aId = NULL);

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -125 +125 @@
 
     STDMETHOD(CreateMachine) (IN_BSTR aName, IN_BSTR aOsTypeId, IN_BSTR aBaseFolder,
-                              IN_BSTR aId, IMachine **aMachine);
+                              IN_BSTR aId, BOOL aOverride, IMachine **aMachine);
     STDMETHOD(CreateLegacyMachine) (IN_BSTR aName, IN_BSTR aOsTypeId, IN_BSTR aSettingsFile,
                                     IN_BSTR aId, IMachine **aMachine);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -742 +742 @@
         RTPrintf ("Creating a new machine object (base dir '%ls', name '%ls')...\n",
                 baseDir.raw(), name.raw());
-        CHECK_ERROR_BREAK (virtualBox, CreateMachine (baseDir, name,
+        CHECK_ERROR_BREAK (virtualBox, CreateMachine (name, L"", baseDir, L"",
+                                                      false,
                                                       machine.asOutParam()));
 

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

@@ -8 +8 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -195 +195 @@
     nsCOMPtr <IMachine> machine;
     rc = virtualBox->CreateMachine(NS_LITERAL_STRING("A brand new name").get(),
-                                   nsnull, nsnull, nsnull, getter_AddRefs(machine));
+                                   nsnull, nsnull, nsnull, false, getter_AddRefs(machine));
     if (NS_FAILED(rc))
     {