Changeset 58450 in vbox for trunk/src/VBox

Timestamp:

Oct 28, 2015 3:51:28 PM (9 years ago)

Author:

vboxsync

Message:

VBoxManage: Show effective paravirt. provider through 'showvminfo' not just the GUI.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)

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

@@ -349 +349 @@
 }
 
+static const char *paravirtProviderToString(ParavirtProvider_T provider, VMINFO_DETAILS details)
+{
+    switch (provider)
+    {
+        case ParavirtProvider_None:
+            if (details == VMINFO_MACHINEREADABLE)
+                return "none";
+            return "None";
+
+        case ParavirtProvider_Default:
+            if (details == VMINFO_MACHINEREADABLE)
+                return "default";
+            return "Default";
+
+        case ParavirtProvider_Legacy:
+            if (details == VMINFO_MACHINEREADABLE)
+                return "legacy";
+            return "Legacy";
+
+        case ParavirtProvider_Minimal:
+            if (details == VMINFO_MACHINEREADABLE)
+                return "minimal";
+            return "Minimal";
+
+        case ParavirtProvider_HyperV:
+            if (details == VMINFO_MACHINEREADABLE)
+                return "hyperv";
+            return "HyperV";
+
+        case ParavirtProvider_KVM:
+            if (details == VMINFO_MACHINEREADABLE)
+                return "kvm";
+            return "KVM";
+
+        default:
+            if (details == VMINFO_MACHINEREADABLE)
+                return "unknown";
+            return "Unknown";
+    }
+}
+
 
 /* Disable global optimizations for MSC 8.0/64 to make it compile in reasonable
@@ -689 +730 @@
     ParavirtProvider_T paravirtProvider;
     CHECK_ERROR2I_RET(machine, COMGETTER(ParavirtProvider)(&paravirtProvider), hrcCheck);
-    const char *pszParavirtProvider;
-    switch (paravirtProvider)
-    {
-        case ParavirtProvider_None:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszParavirtProvider = "none";
-            else
-                pszParavirtProvider = "None";
-            break;
-
-        case ParavirtProvider_Default:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszParavirtProvider = "default";
-            else
-                pszParavirtProvider = "Default";
-            break;
-
-        case ParavirtProvider_Legacy:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszParavirtProvider = "legacy";
-            else
-                pszParavirtProvider = "Legacy";
-            break;
-
-        case ParavirtProvider_Minimal:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszParavirtProvider = "minimal";
-            else
-                pszParavirtProvider = "Minimal";
-            break;
-
-        case ParavirtProvider_HyperV:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszParavirtProvider = "hyperv";
-            else
-                pszParavirtProvider = "HyperV";
-            break;
-
-        case ParavirtProvider_KVM:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszParavirtProvider = "kvm";
-            else
-                pszParavirtProvider = "KVM";
-            break;
-
-        default:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszParavirtProvider = "unknown";
-            else
-                pszParavirtProvider = "Unknown";
-    }
+    const char *pszParavirtProvider = paravirtProviderToString(paravirtProvider, details);
     if (details == VMINFO_MACHINEREADABLE)
         RTPrintf("paravirtprovider=\"%s\"\n", pszParavirtProvider);
     else
         RTPrintf("Paravirt. Provider: %s\n", pszParavirtProvider);
+
+    ParavirtProvider_T effParavirtProvider;
+    CHECK_ERROR2I_RET(machine, COMGETTER(EffectiveParavirtProvider)(&effParavirtProvider), hrcCheck);
+    const char *pszEffParavirtProvider = paravirtProviderToString(effParavirtProvider, details);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("effparavirtprovider=\"%s\"\n", pszEffParavirtProvider);
+    else
+        RTPrintf("Effective Paravirt. Provider: %s\n", pszEffParavirtProvider);
 
     Bstr paravirtDebug;