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

Timestamp:

Nov 18, 2009 12:09:41 PM (15 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: print the "usage" info for dvd and floppy media, just like for hard disks. Use same formatting everywhere.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (modified) (5 diffs)

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

@@ -552 +552 @@
                 Bstr uuid;
                 hdd->COMGETTER(Id)(uuid.asOutParam());
-                RTPrintf("UUID:         %s\n", Utf8Str(uuid).raw());
+                RTPrintf("UUID:       %s\n", Utf8Str(uuid).raw());
                 Bstr format;
                 hdd->COMGETTER(Format)(format.asOutParam());
-                RTPrintf("Format:       %lS\n", format.raw());
+                RTPrintf("Format:     %lS\n", format.raw());
                 Bstr filepath;
                 hdd->COMGETTER(Location)(filepath.asOutParam());
-                RTPrintf("Location:     %lS\n", filepath.raw());
+                RTPrintf("Location:   %lS\n", filepath.raw());
                 MediumState_T enmState;
                 /// @todo NEWMEDIA check accessibility of all parents
                 /// @todo NEWMEDIA print the full state value
                 hdd->RefreshState(&enmState);
-                RTPrintf("Accessible:   %s\n", enmState != MediumState_Inaccessible ? "yes" : "no");
+                RTPrintf("Accessible: %s\n", enmState != MediumState_Inaccessible ? "yes" : "no");
 
                 MediumType_T type;
@@ -580 +580 @@
                         break;
                 }
-                RTPrintf("Type:         %s\n", typeStr);
+                RTPrintf("Type:       %s\n", typeStr);
 
                 com::SafeArray<BSTR> machineIds;
@@ -593 +593 @@
                     machine->COMGETTER(Id)(uuid.asOutParam());
                     RTPrintf("%s%lS (UUID: %lS)\n",
-                            j == 0 ? "Usage:        " : "              ",
+                            j == 0 ? "Usage:      " : "            ",
                             name.raw(), machineIds[j]);
                 }
@@ -620 +620 @@
                 dvdImage->RefreshState(&enmState);
                 RTPrintf("Accessible: %s\n", enmState != MediumState_Inaccessible ? "yes" : "no");
-                /** @todo usage */
+
+                com::SafeArray<BSTR> machineIds;
+                dvdImage->COMGETTER(MachineIds)(ComSafeArrayAsOutParam(machineIds));
+                for (size_t j = 0; j < machineIds.size(); ++ j)
+                {
+                    ComPtr<IMachine> machine;
+                    CHECK_ERROR(a->virtualBox, GetMachine(machineIds[j], machine.asOutParam()));
+                    ASSERT(machine);
+                    Bstr name;
+                    machine->COMGETTER(Name)(name.asOutParam());
+                    machine->COMGETTER(Id)(uuid.asOutParam());
+                    RTPrintf("%s%lS (UUID: %lS)\n",
+                            j == 0 ? "Usage:      " : "            ",
+                            name.raw(), machineIds[j]);
+                }
                 RTPrintf("\n");
             }
@@ -642 +656 @@
                 floppyImage->RefreshState(&enmState);
                 RTPrintf("Accessible: %s\n", enmState != MediumState_Inaccessible ? "yes" : "no");
-                /** @todo usage */
+
+                com::SafeArray<BSTR> machineIds;
+                floppyImage->COMGETTER(MachineIds)(ComSafeArrayAsOutParam(machineIds));
+                for (size_t j = 0; j < machineIds.size(); ++ j)
+                {
+                    ComPtr<IMachine> machine;
+                    CHECK_ERROR(a->virtualBox, GetMachine(machineIds[j], machine.asOutParam()));
+                    ASSERT(machine);
+                    Bstr name;
+                    machine->COMGETTER(Name)(name.asOutParam());
+                    machine->COMGETTER(Id)(uuid.asOutParam());
+                    RTPrintf("%s%lS (UUID: %lS)\n",
+                            j == 0 ? "Usage:      " : "            ",
+                            name.raw(), machineIds[j]);
+                }
                 RTPrintf("\n");
             }