Changeset 54911 in vbox

Timestamp:

Mar 23, 2015 5:24:33 PM (10 years ago)

Author:

vboxsync

Message:

Main: Added paravirt. provider KVM APIs.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (3 diffs)
• Main/xml/Settings.cpp (modified) (2 diffs)

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

@@ -181 +181 @@
                      "                            [--triplefaultreset on|off]\n"
                      "                            [--paravirtprovider none|default|legacy|minimal|\n"
-                     "                                                hyperv]\n"
+                     "                                                hyperv|kvm]\n"
                      "                            [--hwvirtex on|off]\n"
                      "                            [--nestedpaging on|off]\n"

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -718 +718 @@
             else
                 pszParavirtProvider = "HyperV";
+            break;
+
+        case ParavirtProvider_KVM:
+            if (details == VMINFO_MACHINEREADABLE)
+                pszParavirtProvider = "kvm";
+            else
+                pszParavirtProvider = "KVM";
             break;
 

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

@@ -661 +661 @@
                 else if (!RTStrICmp(ValueUnion.psz, "hyperv"))
                     CHECK_ERROR(machine, COMSETTER(ParavirtProvider)(ParavirtProvider_HyperV));
+                else if (!RTStrICmp(ValueUnion.psz, "kvm"))
+                    CHECK_ERROR(machine, COMSETTER(ParavirtProvider)(ParavirtProvider_KVM));
                 else
                 {

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1027 +1027 @@
   <enum
     name="ParavirtProvider"
-    uuid="f9448c17-7caa-4ca7-9349-edafe369fcb5"
+    uuid="696453ec-3742-4a05-bead-658ccbf2c944"
     >
     <desc>
@@ -1049 +1049 @@
       <desc>Microsoft Hyper-V.</desc>
     </const>
+        <const name="KVM"      value="5">
+          <desc>Linux KVM.</desc>
+        </const>
   </enum>
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1203 +1203 @@
             case ParavirtProvider_HyperV:
                 pcszParavirtProvider = "HyperV";
+                break;
+
+            case ParavirtProvider_KVM:
+                pcszParavirtProvider = "KVM";
                 break;
 

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -1254 +1254 @@
         case ParavirtProvider_None:
         case ParavirtProvider_HyperV:
+        case ParavirtProvider_KVM:
         case ParavirtProvider_Minimal:
             break;
@@ -1301 +1302 @@
                         *aParavirtProvider = ParavirtProvider_HyperV;
                     }
+                    else if (   mUserData->s.strOsType == "Debian"      /** @todo add more. */
+                             || mUserData->s.strOsType == "Debian_64"
+                             || mUserData->s.strOsType == "Ubuntu"
+                             || mUserData->s.strOsType == "Ubuntu_64")
+                    {
+                        *aParavirtProvider = ParavirtProvider_KVM;
+                    }
                     else
                         *aParavirtProvider = ParavirtProvider_None;
@@ -1312 +1320 @@
     Assert(   *aParavirtProvider == ParavirtProvider_None
            || *aParavirtProvider == ParavirtProvider_Minimal
-           || *aParavirtProvider == ParavirtProvider_HyperV);
+           || *aParavirtProvider == ParavirtProvider_HyperV
+           || *aParavirtProvider == ParavirtProvider_KVM);
     return S_OK;
 }

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2856 +2856 @@
                 else if (strProvider == "HyperV")
                     hw.paravirtProvider = ParavirtProvider_HyperV;
+                else if (strProvider == "KVM")
+                    hw.paravirtProvider = ParavirtProvider_KVM;
                 else
                     throw ConfigFileError(this,
@@ -4179 +4181 @@
             case ParavirtProvider_Minimal:      pcszParavirtProvider = "Minimal";  break;
             case ParavirtProvider_HyperV:       pcszParavirtProvider = "HyperV";   break;
+            case ParavirtProvider_KVM:          pcszParavirtProvider = "KVM";      break;
             default:            Assert(false);  pcszParavirtProvider = "None";     break;
         }