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

Timestamp:

Nov 9, 2009 1:35:37 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage: Implemented the --forceunmount option

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageStorageController.cpp (modified) (7 diffs)

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

@@ -361 +361 @@
                  "                             --medium <none|emptydrive|uuid|filename|host:<drive>>]\n"
                  "                            [--passthrough <on|off>]\n"
+                 "                            [--forceunmount <on|off>]\n"
                  "\n");
     }

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

@@ -55 +55 @@
     { "--type",           't', RTGETOPT_REQ_STRING },
     { "--passthrough",    'h', RTGETOPT_REQ_STRING },
+    { "--forceunmount",   'f', RTGETOPT_REQ_BOOL_ONOFF },
 };
 
@@ -64 +65 @@
     ULONG device = ~0U;
     bool fRunTime = false;
+    bool fForceUnmount = false;
     const char *pszCtl  = NULL;
     const char *pszType = NULL;
@@ -136 +138 @@
             }
 
+            case 'f':   // force unmount medium during runtime <on|off>
+            {
+                fForceUnmount = ValueUnion.f;
+                break;
+            }
+
             default:
             {
@@ -228 +236 @@
         {
             ComPtr<IMediumAttachment> mediumAttachment;
+            DeviceType_T deviceType = DeviceType_Null;
             rc = machine->GetMediumAttachment(Bstr(pszCtl), port, device, mediumAttachment.asOutParam());
             if (SUCCEEDED(rc))
             {
-                DeviceType_T deviceType;
                 mediumAttachment->COMGETTER(Type)(&deviceType);
 
@@ -238 +246 @@
                 {
                     /* just unmount the floppy/dvd */
-                    CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, Bstr(""), FALSE /* aForce */));
-                }
-                else
-                {
-                    errorArgument("No DVD/Floppy Drive attached to the controller '%s'"
-                                  "at the port: %u, device: %u", pszCtl, port, device);
-                    goto leave;
-                }
-            }
-            else
+                    CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, Bstr(""), fForceUnmount));
+                }
+            }
+
+            if (   FAILED(rc)
+                || !(   deviceType == DeviceType_DVD
+                     || deviceType == DeviceType_Floppy))
             {
                 errorArgument("No DVD/Floppy Drive attached to the controller '%s'"
@@ -493 +498 @@
             {
                 dvdMedium->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid, FALSE /* aForce */));
+                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid, fForceUnmount));
             }
         }
@@ -588 +593 @@
             {
                 floppyMedium->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid, FALSE /* aForce */));
+                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl), port, device, uuid, fForceUnmount));
             }
         }