Changeset 24493 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 9, 2009 11:59:49 AM (15 years ago)

Author:

vboxsync

Message:

API/Machine,Session: add a force mount parameter to MountMedium and the associated other places

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageStorageController.cpp (modified) (3 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxMediaManagerDlg.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxVMFirstRunWzd.cpp (modified) (1 diff)

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

@@ -1181 +1181 @@
             else
                 uuid = Guid().toString();
-            CHECK_ERROR(machine, MountMedium(Bstr("IDE Controller"), 1, 0, uuid));
+            CHECK_ERROR(machine, MountMedium(Bstr("IDE Controller"), 1, 0, uuid, FALSE /* aForce */));
         }
         else if (!strcmp(a->argv[1], "floppyattach"))
@@ -1237 +1237 @@
             }
             floppyMedium->COMGETTER(Id)(uuid.asOutParam());
-            CHECK_ERROR(machine, MountMedium(Bstr("Floppy Controller"), 0, 0, uuid));
+            CHECK_ERROR(machine, MountMedium(Bstr("Floppy Controller"), 0, 0, uuid, FALSE /* aForce */));
         }
 #ifdef VBOX_WITH_MEM_BALLOONING

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

@@ -910 +910 @@
                 if (dvdMedium)
                     dvdMedium->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(machine, MountMedium(Bstr("IDE Controller"), 1, 0, uuid));
+                CHECK_ERROR(machine, MountMedium(Bstr("IDE Controller"), 1, 0, uuid, FALSE /* aForce */));
                 break;
             }
@@ -978 +978 @@
                     }
                     floppyMedium->COMGETTER(Id)(uuid.asOutParam());
-                    CHECK_ERROR(machine, MountMedium(Bstr("Floppy Controller"), 0, 0, uuid));
+                    CHECK_ERROR(machine, MountMedium(Bstr("Floppy Controller"), 0, 0, uuid, FALSE /* aForce */));
                 }
                 break;

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

@@ -238 +238 @@
                 {
                     /* just unmount the floppy/dvd */
-                    CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, Bstr("")));
+                    CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, Bstr(""), FALSE /* aForce */));
                 }
                 else
@@ -493 +493 @@
             {
                 dvdMedium->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid));
+                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid, FALSE /* aForce */));
             }
         }
@@ -588 +588 @@
             {
                 floppyMedium->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid));
+                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid, FALSE /* aForce */));
             }
         }

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1670 +1670 @@
         }
 
-        CHECK_ERROR (gMachine, MountMedium(storageCtlName, 0, 0, id));
+        CHECK_ERROR (gMachine, MountMedium(storageCtlName, 0, 0, id, FALSE /* aForce */));
     }
     while (0);
@@ -1754 +1754 @@
         }
 
-        CHECK_ERROR(gMachine, MountMedium(storageCtlName, 1, 0, id));
+        CHECK_ERROR(gMachine, MountMedium(storageCtlName, 1, 0, id, FALSE /*aForce */));
     }
     while (0);

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

@@ -1090 +1090 @@
     if (!ctrName.isNull())
     {
-        m.MountMedium (ctrName, ctrPort, ctrDevice, uuid);
+        m.MountMedium (ctrName, ctrPort, ctrDevice, uuid, false /* force */);
         AssertWrapperOk (m);
         if (m.isOk())
@@ -2374 +2374 @@
     machine.MountMedium (target.name, target.port, target.device,
                          target.id.isEmpty() || medium.isNull() || medium.GetId() != target.id ||
-                         target.type != VBoxDefs::MediumType_Invalid ? target.id : QString (""));
+                         target.type != VBoxDefs::MediumType_Invalid ? target.id : QString (""), false /* force */);
 }
 

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

@@ -1202 +1202 @@
                 if (medium.id() == aMedium.id())
                 {
-                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString(""));
+                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString(""), false /* force */);
                     if (!machine.isOk())
                     {
@@ -1223 +1223 @@
                 if (medium.id() == aMedium.id())
                 {
-                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString(""));
+                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString(""), false /* force */);
                     if (!machine.isOk())
                     {

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

@@ -106 +106 @@
     Assert (!ctr.isNull());
     /* Mount medium to the predefined port/device */
-    mMachine.MountMedium (ctrName, ctrPort, ctrDevice, mCbMedia->id());
+    mMachine.MountMedium (ctrName, ctrPort, ctrDevice, mCbMedia->id(), false /* force */);
     if (mMachine.isOk())
         QIAbstractWizard::accept();