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

Timestamp:

Sep 16, 2020 3:39:09 PM (4 years ago)

Author:

vboxsync

Message:

Main: bugref:9224: Added NVME drives enumeration on Linux. Fixed the showing the model of the drive if additional info is not available

File:

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

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

@@ -1602 +1602 @@
     {
         ComPtr<IHostDrive> pHostDrive = apHostDrives[i];
-
+        /*
+         * The drive path and the model are obtained using different way
+         * outside of the IHostDrive object, therefore, they are defined
+         * even if another info is not available.
+         */
         com::Bstr bstrDrivePath;
         CHECK_ERROR(pHostDrive,COMGETTER(DrivePath)(bstrDrivePath.asOutParam()));
@@ -1608 +1612 @@
 
         com::Bstr bstrModel;
+        CHECK_ERROR(pHostDrive,COMGETTER(Model)(bstrModel.asOutParam()));
+        if (bstrModel.isNotEmpty())
+            RTPrintf("Model:       %ls\n", bstrModel.raw());
+        else
+            RTPrintf("Model:       Unknown\n");
+
         com::Bstr bstrUuidDisk;
         ULONG cbSectorSize = 0;
@@ -1613 +1623 @@
         PartitioningType_T partitioningType;
         HRESULT hrc;
-        if (   SUCCEEDED(hrc = pHostDrive->COMGETTER(Model)(bstrModel.asOutParam()))
-            && SUCCEEDED(hrc = pHostDrive->COMGETTER(Uuid)(bstrUuidDisk.asOutParam()))
+        if (   SUCCEEDED(hrc = pHostDrive->COMGETTER(Uuid)(bstrUuidDisk.asOutParam()))
             && SUCCEEDED(hrc = pHostDrive->COMGETTER(SectorSize)(&cbSectorSize))
             && SUCCEEDED(hrc = pHostDrive->COMGETTER(Size)(&cbSize))
             && SUCCEEDED(hrc = pHostDrive->COMGETTER(PartitioningType)(&partitioningType)))
         {
-            if (bstrModel.isNotEmpty())
-                RTPrintf("Model:       %ls\n", bstrModel.raw());
-            else
-                RTPrintf("Model:       Unknown\n");
-
             if (partitioningType == PartitioningType_GPT || com::Guid(bstrUuidDisk).isZero())
                 RTPrintf("UUID:        %ls\n", bstrUuidDisk.raw());