Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 55069)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 55070)
@@ -1187,38 +1187,35 @@
          * Currently only enabled for HM VMs as raw-mode GIM still needs work.
          */
+        if (!fHMEnabled)
+            paravirtProvider = ParavirtProvider_None;
         PCFGMNODE pParavirtNode;
         InsertConfigNode(pRoot, "GIM", &pParavirtNode);
         const char *pcszParavirtProvider;
         bool fGimDeviceNeeded = true;
-        if (fHMEnabled)
-        {
-            switch (paravirtProvider)
-            {
-                case ParavirtProvider_None:
-                    pcszParavirtProvider = "None";
-                    fGimDeviceNeeded = false;
-                    break;
-
-                case ParavirtProvider_Minimal:
-                    pcszParavirtProvider = "Minimal";
-                    break;
-
-                case ParavirtProvider_HyperV:
-                    pcszParavirtProvider = "HyperV";
-                    break;
-
-                case ParavirtProvider_KVM:
-                    pcszParavirtProvider = "KVM";
-                    break;
-
-                default:
-                    AssertMsgFailed(("Invalid paravirtProvider=%d\n", paravirtProvider));
-                    return VMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS, N_("Invalid paravirt. provider '%d'"),
-                                        paravirtProvider);
-            }
-            InsertConfigString(pParavirtNode, "Provider", pcszParavirtProvider);
-        }
-        else
-            InsertConfigString(pParavirtNode, "Provider", "None");
+        switch (paravirtProvider)
+        {
+            case ParavirtProvider_None:
+                pcszParavirtProvider = "None";
+                fGimDeviceNeeded = false;
+                break;
+
+            case ParavirtProvider_Minimal:
+                pcszParavirtProvider = "Minimal";
+                break;
+
+            case ParavirtProvider_HyperV:
+                pcszParavirtProvider = "HyperV";
+                break;
+
+            case ParavirtProvider_KVM:
+                pcszParavirtProvider = "KVM";
+                break;
+
+            default:
+                AssertMsgFailed(("Invalid paravirtProvider=%d\n", paravirtProvider));
+                return VMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS, N_("Invalid paravirt. provider '%d'"),
+                                    paravirtProvider);
+        }
+        InsertConfigString(pParavirtNode, "Provider", pcszParavirtProvider);
 
         /*