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

Timestamp:

Oct 25, 2023 3:37:09 PM (14 months ago)

Author:

vboxsync

Message:

doc/manual,Frontends/VBoxManage,Main/{Global,GuestOSType,VirtualBox.xidl}:
Revisit the OS guest OS changes which added a new 'variant' field to the
Global::sOSTypes[] table along with a new VBoxManage subcommand and
IVirtualBox methods for accessing the guest OS variant information
(r159137). After discussion with the documentation team the identifier
'variant' is being changed to the clearer 'subtype' which also doesn't
overlap with the 'variant' terminology used with medium management
(IMedium::variant(), the MediumVariant enum, etc.). bugref:5936

File:

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

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

@@ -823 +823 @@
         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());
+        Bstr guestOSSubtype;
+        guestOS->COMGETTER(Subtype)(guestOSSubtype.asOutParam());
+        if (guestOSSubtype.isNotEmpty())
+            RTPrintf(List::tr("OS Subtype:  %ls\n"), guestOSSubtype.raw());
         BOOL is64Bit;
         guestOS->COMGETTER(Is64Bit)(&is64Bit);
@@ -2062 +2062 @@
     kListRunningVMs,
     kListOsTypes,
-    kListOsVariants,
+    kListOsSubtypes,
     kListHostDvds,
     kListHostFloppies,
@@ -2208 +2208 @@
         }
 
-        case kListOsVariants:
+        case kListOsSubtypes:
         {
             com::SafeArray<BSTR> GuestOSFamilies;
@@ -2217 +2217 @@
                 {
                     const Bstr bstrOSFamily = GuestOSFamilies[i];
-                    com::SafeArray<BSTR> GuestOSVariants;
+                    com::SafeArray<BSTR> GuestOSSubtypes;
                     CHECK_ERROR(pVirtualBox,
-                                GetGuestOSVariantsByFamilyId(bstrOSFamily.raw(),
-                                                             ComSafeArrayAsOutParam(GuestOSVariants)));
+                                GetGuestOSSubtypesByFamilyId(bstrOSFamily.raw(),
+                                                             ComSafeArrayAsOutParam(GuestOSSubtypes)));
                     if (SUCCEEDED(hrc))
                     {
                         RTPrintf("%ls\n", bstrOSFamily.raw());
-                        for (size_t j = 0; j < GuestOSVariants.size(); ++j)
+                        for (size_t j = 0; j < GuestOSSubtypes.size(); ++j)
                         {
-                            RTPrintf("\t%ls\n", GuestOSVariants[j]);
+                            RTPrintf("\t%ls\n", GuestOSSubtypes[j]);
                             com::SafeArray<BSTR> GuestOSDescs;
-                            const Bstr bstrOSVariant = GuestOSVariants[j];
+                            const Bstr bstrOSSubtype = GuestOSSubtypes[j];
                             CHECK_ERROR(pVirtualBox,
-                                        GetGuestOSDescsByVariant(bstrOSVariant.raw(),
+                                        GetGuestOSDescsBySubtype(bstrOSSubtype.raw(),
                                                                  ComSafeArrayAsOutParam(GuestOSDescs)));
                             if (SUCCEEDED(hrc))
@@ -2478 +2478 @@
         { "runningvms",         kListRunningVMs,         RTGETOPT_REQ_NOTHING },
         { "ostypes",            kListOsTypes,            RTGETOPT_REQ_NOTHING },
-        { "osvariants",         kListOsVariants,         RTGETOPT_REQ_NOTHING },
+        { "ossubtypes",         kListOsSubtypes,         RTGETOPT_REQ_NOTHING },
         { "hostdvds",           kListHostDvds,           RTGETOPT_REQ_NOTHING },
         { "hostfloppies",       kListHostFloppies,       RTGETOPT_REQ_NOTHING },
@@ -2545 +2545 @@
             case kListRunningVMs:
             case kListOsTypes:
-            case kListOsVariants:
+            case kListOsSubtypes:
             case kListHostDvds:
             case kListHostFloppies: