Changeset 101288 in vbox for trunk/src

Timestamp:

Sep 27, 2023 9:51:39 AM (14 months ago)

Author:

vboxsync

Message:

FE/VBoxManage: Added listing supported guest OS types for the system properties.

File:

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

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

@@ -792 +792 @@
     pPlatformProperties->GetMaxInstancesOfStorageBus(enmChipsetType, StorageBus_Floppy, &ulValue);
     RTPrintf(List::tr("Maximum %s Floppy Controllers:%u\n"), pszChipset, ulValue);
+
+    return S_OK;
+}
+
+/**
+ * Lists guest OS types.
+ *
+ * @returns HRESULT
+ * @param   aGuestOSTypes       Reference to guest OS types to list.
+ */
+static HRESULT listGuestOSTypes(const com::SafeIfaceArray<IGuestOSType> &aGuestOSTypes)
+{
+    /*
+     * Iterate through the collection.
+     */
+    for (size_t i = 0; i < aGuestOSTypes.size(); ++i)
+    {
+        ComPtr<IGuestOSType> guestOS;
+        guestOS = aGuestOSTypes[i];
+        Bstr guestId;
+        guestOS->COMGETTER(Id)(guestId.asOutParam());
+        RTPrintf("ID:          %ls\n", guestId.raw());
+        Bstr guestDescription;
+        guestOS->COMGETTER(Description)(guestDescription.asOutParam());
+        RTPrintf(List::tr("Description: %ls\n"), guestDescription.raw());
+        Bstr familyId;
+        guestOS->COMGETTER(FamilyId)(familyId.asOutParam());
+        RTPrintf(List::tr("Family ID:   %ls\n"), familyId.raw());
+        Bstr familyDescription;
+        guestOS->COMGETTER(FamilyDescription)(familyDescription.asOutParam());
+        RTPrintf(List::tr("Family Desc: %ls\n"), familyDescription.raw());
+        Bstr guestOSVariant;
+        guestOS->COMGETTER(Variant)(guestOSVariant.asOutParam());
+        if (guestOSVariant.isNotEmpty())
+            RTPrintf(List::tr("OS Variant:  %ls\n"), guestOSVariant.raw());
+        BOOL is64Bit;
+        guestOS->COMGETTER(Is64Bit)(&is64Bit);
+        RTPrintf(List::tr("64 bit:      %RTbool\n"), is64Bit);
+        RTPrintf("\n");
+    }
 
     return S_OK;
@@ -853 +893 @@
         listPlatformChipsetProperties(platformProperties, saChipset[i]);
     }
+
+    RTPrintf("\n");
+
+    RTPrintf(List::tr("Supported guest OS types:\n\n"));
+
+    com::SafeIfaceArray<IGuestOSType> coll;
+    platformProperties->GetSupportedGuestOSTypes(ComSafeArrayAsOutParam(coll));
+        listGuestOSTypes(coll);
 
     return S_OK;
@@ -2156 +2204 @@
             hrc = pVirtualBox->COMGETTER(GuestOSTypes)(ComSafeArrayAsOutParam(coll));
             if (SUCCEEDED(hrc))
-            {
-                /*
-                 * Iterate through the collection.
-                 */
-                for (size_t i = 0; i < coll.size(); ++i)
-                {
-                    ComPtr<IGuestOSType> guestOS;
-                    guestOS = coll[i];
-                    Bstr guestId;
-                    guestOS->COMGETTER(Id)(guestId.asOutParam());
-                    RTPrintf("ID:          %ls\n", guestId.raw());
-                    Bstr guestDescription;
-                    guestOS->COMGETTER(Description)(guestDescription.asOutParam());
-                    RTPrintf(List::tr("Description: %ls\n"), guestDescription.raw());
-                    Bstr familyId;
-                    guestOS->COMGETTER(FamilyId)(familyId.asOutParam());
-                    RTPrintf(List::tr("Family ID:   %ls\n"), familyId.raw());
-                    Bstr familyDescription;
-                    guestOS->COMGETTER(FamilyDescription)(familyDescription.asOutParam());
-                    RTPrintf(List::tr("Family Desc: %ls\n"), familyDescription.raw());
-                    Bstr guestOSVariant;
-                    guestOS->COMGETTER(Variant)(guestOSVariant.asOutParam());
-                    if (guestOSVariant.isNotEmpty())
-                        RTPrintf(List::tr("OS Variant:  %ls\n"), guestOSVariant.raw());
-                    BOOL is64Bit;
-                    guestOS->COMGETTER(Is64Bit)(&is64Bit);
-                    RTPrintf(List::tr("64 bit:      %RTbool\n"), is64Bit);
-                    RTPrintf("\n");
-                }
-            }
+                listGuestOSTypes(coll);
             break;
         }