Changeset 23249 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Sep 23, 2009 9:57:11 AM (16 years ago)

Author:

vboxsync

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

52725

Message:

medium: rename default IDE/FD storage controller names to IDE Controller and Floppy Controller

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (2 diffs)
• VBoxManageInfo.cpp (modified) (8 diffs)
• VBoxManageModifyVM.cpp (modified) (12 diffs)

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

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

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

@@ -449 +449 @@
     bool                       fFloppyEnabled = false;
 
-    rc = machine->GetStorageControllerByName(Bstr("FD"), FloppyCtl.asOutParam());
+    rc = machine->GetStorageControllerByName(Bstr("Floppy Controller"), FloppyCtl.asOutParam());
     if (SUCCEEDED(rc))
         fFloppyEnabled = true;
@@ -470 +470 @@
         for (ULONG i = 0; i < cFloppyPorts; ++ i)
         {
-            rc = machine->GetMedium(Bstr("FD"), 0, i, floppyMedium.asOutParam());
+            rc = machine->GetMedium(Bstr("Floppy Controller"), 0, i, floppyMedium.asOutParam());
             if (SUCCEEDED(rc) && floppyMedium)
             {
@@ -548 +548 @@
     ComPtr<IStorageController> ideController;
 
-    rc = machine->GetStorageControllerByName(Bstr("IDE"), ideController.asOutParam());
+    rc = machine->GetStorageControllerByName(Bstr("IDE Controller"), ideController.asOutParam());
     if (SUCCEEDED(rc) && ideController)
     {
@@ -578 +578 @@
     ComPtr<IMedium> hardDisk;
     Bstr filePath;
-    rc = machine->GetMedium(Bstr("IDE"), 0, 0, hardDisk.asOutParam());
+    rc = machine->GetMedium(Bstr("IDE Controller"), 0, 0, hardDisk.asOutParam());
     if (SUCCEEDED(rc) && hardDisk)
     {
@@ -596 +596 @@
             RTPrintf("hda=\"none\"\n");
     }
-    rc = machine->GetMedium(Bstr("IDE"), 0, 1, hardDisk.asOutParam());
+    rc = machine->GetMedium(Bstr("IDE Controller"), 0, 1, hardDisk.asOutParam());
     if (SUCCEEDED(rc) && hardDisk)
     {
@@ -614 +614 @@
             RTPrintf("hdb=\"none\"\n");
     }
-    rc = machine->GetMedium(Bstr("IDE"), 1, 1, hardDisk.asOutParam());
+    rc = machine->GetMedium(Bstr("IDE Controller"), 1, 1, hardDisk.asOutParam());
     if (SUCCEEDED(rc) && hardDisk)
     {
@@ -633 +633 @@
     }
     ComPtr<IMedium> dvdMedium;
-    rc = machine->GetMedium(Bstr("IDE"), 1, 0, dvdMedium.asOutParam());
+    rc = machine->GetMedium(Bstr("IDE Controller"), 1, 0, dvdMedium.asOutParam());
     if (SUCCEEDED(rc) && dvdMedium)
     {
@@ -648 +648 @@
         BOOL fPassthrough;
         ComPtr<IMediumAttachment> dvdAttachment;
-        machine->GetMediumAttachment(Bstr("IDE"), 1, 0, dvdAttachment.asOutParam());
+        machine->GetMediumAttachment(Bstr("IDE Controller"), 1, 0, dvdAttachment.asOutParam());
         dvdAttachment->COMGETTER(Passthrough)(&fPassthrough);
         if (details == VMINFO_MACHINEREADABLE)

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

@@ -1174 +1174 @@
             if (!strcmp(hdds[0], "none"))
             {
-                machine->DetachDevice(Bstr("IDE"), 0, 0);
+                machine->DetachDevice(Bstr("IDE Controller"), 0, 0);
             }
             else
@@ -1195 +1195 @@
                 {
                     hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE"), 0, 0, DeviceType_HardDisk, uuid));
+                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE Controller"), 0, 0, DeviceType_HardDisk, uuid));
                 }
                 else
@@ -1207 +1207 @@
             if (!strcmp(hdds[1], "none"))
             {
-                machine->DetachDevice(Bstr("IDE"), 0, 1);
+                machine->DetachDevice(Bstr("IDE Controller"), 0, 1);
             }
             else
@@ -1228 +1228 @@
                 {
                     hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE"), 0, 1, DeviceType_HardDisk, uuid));
+                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE Controller"), 0, 1, DeviceType_HardDisk, uuid));
                 }
                 else
@@ -1240 +1240 @@
             if (!strcmp(hdds[2], "none"))
             {
-                machine->DetachDevice(Bstr("IDE"), 1, 1);
+                machine->DetachDevice(Bstr("IDE Controller"), 1, 1);
             }
             else
@@ -1261 +1261 @@
                 {
                     hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE"), 1, 1, DeviceType_HardDisk, uuid));
+                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE Controller"), 1, 1, DeviceType_HardDisk, uuid));
                 }
                 else
@@ -1330 +1330 @@
              * storage controllers. */
             dvdMedium->COMGETTER(Id)(uuid.asOutParam());
-            CHECK_ERROR(machine, MountMedium(Bstr("IDE"), 1, 0, uuid));
+            CHECK_ERROR(machine, MountMedium(Bstr("IDE Controller"), 1, 0, uuid));
         }
         if (dvdpassthrough)
         {
             ComPtr<IMediumAttachment> dvdAttachment;
-            machine->GetMediumAttachment(Bstr("IDE"), 1, 0, dvdAttachment.asOutParam());
+            machine->GetMediumAttachment(Bstr("IDE Controller"), 1, 0, dvdAttachment.asOutParam());
             ASSERT(dvdAttachment);
 
@@ -1343 +1343 @@
         {
             ComPtr<IStorageController> storageController;
-            CHECK_ERROR(machine, GetStorageControllerByName(Bstr("IDE"), storageController.asOutParam()));
+            CHECK_ERROR(machine, GetStorageControllerByName(Bstr("IDE Controller"), storageController.asOutParam()));
 
             if (!RTStrICmp(idecontroller, "PIIX3"))
@@ -1368 +1368 @@
             ComPtr<IMedium> floppyMedium;
             ComPtr<IMediumAttachment> floppyAttachment;
-            machine->GetMediumAttachment(Bstr("FD"), 0, 0, floppyAttachment.asOutParam());
+            machine->GetMediumAttachment(Bstr("Floppy Controller"), 0, 0, floppyAttachment.asOutParam());
 
             /* disable? */
@@ -1375 +1375 @@
                 /* disable the controller */
                 if (floppyAttachment)
-                    CHECK_ERROR(machine, DetachDevice(Bstr("FD"), 0, 0));
+                    CHECK_ERROR(machine, DetachDevice(Bstr("Floppy Controller"), 0, 0));
             }
             else
@@ -1381 +1381 @@
                 /* enable the controller */
                 if (!floppyAttachment)
-                    CHECK_ERROR(machine, AttachDevice(Bstr("FD"), 0, 0, DeviceType_Floppy, NULL));
+                    CHECK_ERROR(machine, AttachDevice(Bstr("Floppy Controller"), 0, 0, DeviceType_Floppy, NULL));
 
                 /* unmount? */
@@ -1425 +1425 @@
                 }
                 floppyMedium->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(machine, MountMedium(Bstr("FD"), 0, 0, uuid));
+                CHECK_ERROR(machine, MountMedium(Bstr("Floppy Controller"), 0, 0, uuid));
             }
         }