Changeset 101164 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

Timestamp:

Sep 19, 2023 10:01:39 AM (15 months ago)

Author:

vboxsync

Message:

doc/manual,Frontends/VBoxManage,Main/{Global,GuestOSType,VirtualBox.xidl}:
Extend the OSType struct by including a new element named 'variant'
to provide further guest OS details and aid in guest OS categorization
for the GUI when creating VMs. Populate this field in the
Global::sOSTypes[] table for Linux using the distro name and for BSD
using the BSD flavour. Include the variant information in 'VBoxManage
list ostypes' and add a new 'VBoxManage list osvariants' subcommand.
Add new IVirtualBox methods for accessing the guest OS variant
information: getGuestOSVariantsByFamilyId() and getGuestOSDescsByVariant().
bugref:5936

File:

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

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

@@ -2014 +2014 @@
     kListRunningVMs,
     kListOsTypes,
+    kListOsVariants,
     kListHostDvds,
     kListHostFloppies,
@@ -2175 +2176 @@
                     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");
+                }
+            }
+            break;
+        }
+
+        case kListOsVariants:
+        {
+            com::SafeArray<BSTR> GuestOSFamilies;
+            CHECK_ERROR(pVirtualBox, COMGETTER(GuestOSFamilies)(ComSafeArrayAsOutParam(GuestOSFamilies)));
+            if (SUCCEEDED(hrc))
+            {
+                for (size_t i = 0; i < GuestOSFamilies.size(); ++i)
+                {
+                    const Bstr bstrOSFamily = GuestOSFamilies[i];
+                    com::SafeArray<BSTR> GuestOSVariants;
+                    CHECK_ERROR(pVirtualBox,
+                                COMGETTER(GuestOSVariantsByFamilyId)(bstrOSFamily.raw(),
+                                          ComSafeArrayAsOutParam(GuestOSVariants)));
+                    if (SUCCEEDED(hrc))
+                    {
+                        RTPrintf("%ls\n", bstrOSFamily.raw());
+                        for (size_t j = 0; j < GuestOSVariants.size(); ++j)
+                        {
+                            RTPrintf("\t%ls\n", GuestOSVariants[j]);
+                            com::SafeArray<BSTR> GuestOSDescs;
+                            const Bstr bstrOSVariant = GuestOSVariants[j];
+                            CHECK_ERROR(pVirtualBox,
+                                        COMGETTER(GuestOSDescsByVariant)(bstrOSVariant.raw(),
+                                                  ComSafeArrayAsOutParam(GuestOSDescs)));
+                            if (SUCCEEDED(hrc))
+                                for (size_t k = 0; k < GuestOSDescs.size(); ++k)
+                                    RTPrintf("\t\t%ls\n", GuestOSDescs[k]);
+                        }
+                    }
                 }
             }
@@ -2420 +2459 @@
         { "runningvms",         kListRunningVMs,         RTGETOPT_REQ_NOTHING },
         { "ostypes",            kListOsTypes,            RTGETOPT_REQ_NOTHING },
+        { "osvariants",         kListOsVariants,         RTGETOPT_REQ_NOTHING },
         { "hostdvds",           kListHostDvds,           RTGETOPT_REQ_NOTHING },
         { "hostfloppies",       kListHostFloppies,       RTGETOPT_REQ_NOTHING },
@@ -2486 +2526 @@
             case kListRunningVMs:
             case kListOsTypes:
+            case kListOsVariants:
             case kListHostDvds:
             case kListHostFloppies: