Changeset 50996 in vbox

Timestamp:

Apr 8, 2014 1:15:27 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93182

Message:

Main: Added paravirt. provider APIs.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (3 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (4 diffs)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (5 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (6 diffs)

trunk/include/VBox/settings.h

@@ -18 +18 @@
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -866 +866 @@
     bool operator==(const Hardware&) const;
 
+    bool areParavirtDefaultSettings() const
+    {
+        return paravirtProvider == ParavirtProvider_Legacy;
+    }
+
     com::Utf8Str        strVersion;             // hardware version, optional
     com::Guid           uuid;                   // hardware uuid, optional (null).
@@ -912 +917 @@
 
     ChipsetType_T       chipsetType;            // requires settings version 1.11 (VirtualBox 4.0)
+    ParavirtProvider_T  paravirtProvider;       // requires settings version 1.15 (VirtualBox 4.4)
 
     bool                fEmulatedUSBCardReader; // 1.12 (VirtualBox 4.1)

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

@@ -179 +179 @@
                      "                            [--hpet on|off]\n"
                      "                            [--triplefaultreset on|off]\n"
+                     "                            [--paravirtprovider none|default|legacy|minimal|\n"
+                     "                                                hyperv]\n"
                      "                            [--hwvirtex on|off]\n"
                      "                            [--nestedpaging on|off]\n"
@@ -328 +330 @@
                      "                            [--clipboard disabled|hosttoguest|guesttohost|\n"
                      "                                         bidirectional]\n"
-                     "                            [--draganddrop disabled|hosttoguest\n");
+                     "                            [--draganddrop disabled|hosttoguest]\n");
         RTStrmPrintf(pStrm,
                      "                            [--vrde on|off]\n"

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -676 +676 @@
     SHOW_BOOLEAN_METHOD(machine, GetHWVirtExProperty(HWVirtExPropertyType_VPID, &f),        "vtxvpid",      "VT-x VPID");
     SHOW_BOOLEAN_METHOD(machine, GetHWVirtExProperty(HWVirtExPropertyType_UnrestrictedExecution, &f), "vtxux", "VT-x unr. exec.");
+
+    ParavirtProvider_T paravirtProvider;
+    CHECK_ERROR2_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;
+
+        default:
+            if (details == VMINFO_MACHINEREADABLE)
+                pszParavirtProvider = "unknown";
+            else
+                pszParavirtProvider = "Unknown";
+    }
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("paravirtprovider=\"%s\"\n", pszParavirtProvider);
+    else
+        RTPrintf("Paravirt. Provider:  %s\n", pszParavirtProvider);
+
 
     MachineState_T machineState;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -62 +62 @@
     MODIFYVM_SYNTHCPU,
     MODIFYVM_TFRESET,
+    MODIFYVM_PARAVIRTPROVIDER,
     MODIFYVM_HWVIRTEX,
     MODIFYVM_NESTEDPAGING,
@@ -222 +223 @@
     { "--longmode",                 MODIFYVM_LONGMODE,                  RTGETOPT_REQ_BOOL_ONOFF },
     { "--synthcpu",                 MODIFYVM_SYNTHCPU,                  RTGETOPT_REQ_BOOL_ONOFF },
-    { "--triplefaultreset",         MODIFYVM_TFRESET,                  RTGETOPT_REQ_BOOL_ONOFF },
+    { "--triplefaultreset",         MODIFYVM_TFRESET,                   RTGETOPT_REQ_BOOL_ONOFF },
+    { "--paravirtprovider",         MODIFYVM_PARAVIRTPROVIDER,          RTGETOPT_REQ_STRING },
     { "--hwvirtex",                 MODIFYVM_HWVIRTEX,                  RTGETOPT_REQ_BOOL_ONOFF },
     { "--nestedpaging",             MODIFYVM_NESTEDPAGING,              RTGETOPT_REQ_BOOL_ONOFF },
@@ -631 +633 @@
             }
 
+            case MODIFYVM_PARAVIRTPROVIDER:
+            {
+                if (   !RTStrICmp(ValueUnion.psz, "none")
+                    || !RTStrICmp(ValueUnion.psz, "disabled"))
+                    CHECK_ERROR(machine, COMSETTER(ParavirtProvider)(ParavirtProvider_None));
+                else if (!RTStrICmp(ValueUnion.psz, "default"))
+                    CHECK_ERROR(machine, COMSETTER(ParavirtProvider)(ParavirtProvider_Default));
+                else if (!RTStrICmp(ValueUnion.psz, "legacy"))
+                    CHECK_ERROR(machine, COMSETTER(ParavirtProvider)(ParavirtProvider_Legacy));
+                else if (!RTStrICmp(ValueUnion.psz, "minimal"))
+                    CHECK_ERROR(machine, COMSETTER(ParavirtProvider)(ParavirtProvider_Minimal));
+                else if (!RTStrICmp(ValueUnion.psz, "hyperv"))
+                    CHECK_ERROR(machine, COMSETTER(ParavirtProvider)(ParavirtProvider_HyperV));
+                else
+                {
+                    errorArgument("Invalid --paravirtprovider argument '%s'", ValueUnion.psz);
+                    rc = E_FAIL;
+                }
+                break;
+            }
+
             case MODIFYVM_HWVIRTEX:
             {

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

@@ -1008 +1008 @@
       </desc>
     </const>
+  </enum>
+
+  <enum
+        name="ParavirtProvider"
+        uuid="f9448c17-7caa-4ca7-9349-edafe369fcb5"
+        >
+        <desc>
+          The paravirtualized guest interface provider. This enumeration represents possible
+          values for the <link to="IMachine::paravirtProvider"/> attribute.
+        </desc>
+        <const name="None"     value="0">
+          <desc>No provider is used.</desc>
+        </const>
+        <const name="Default"  value="1">
+          <desc>A default provider is automatically chosen according to the guest OS type.</desc>
+        </const>
+        <const name="Legacy"   value="2">
+      <desc>Used for VMs which didn't used to have any provider settings. Usually
+        interpreted as @c None for most VMs.</desc>
+        </const>
+        <const name="Minimal"  value="3">
+          <desc>A minimal set of features to expose to the paravirtualized guest.</desc>
+        </const>
+        <const name="HyperV"   value="4">
+          <desc>Microsoft Hyper-V.</desc>
+        </const>
   </enum>
 
@@ -4814 +4840 @@
     </attribute>
 
+        <attribute name="paravirtProvider" type="ParavirtProvider">
+          <desc>
+            The paravirtualized guest interface provider.
+          </desc>
+        </attribute>
+
     <attribute name="faultToleranceState" type="FaultToleranceState">
       <desc>

trunk/src/VBox/Main/include/MachineImpl.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -307 +307 @@
         PointingHIDType_T   mPointingHIDType;
         ChipsetType_T       mChipsetType;
+        ParavirtProvider_T  mParavirtProvider;
         BOOL                mEmulatedUSBCardReaderEnabled;
 
@@ -505 +506 @@
     STDMETHOD(COMGETTER(ChipsetType))(ChipsetType_T *aChipsetType);
     STDMETHOD(COMSETTER(ChipsetType))(ChipsetType_T  aChipsetType);
+    STDMETHOD(COMGETTER(ParavirtProvider))(ParavirtProvider_T *aParavirtProvider);
+    STDMETHOD(COMSETTER(ParavirtProvider))(ParavirtProvider_T  aParavirtProvider);
     STDMETHOD(COMGETTER(IOCacheEnabled))(BOOL *aEnabled);
     STDMETHOD(COMSETTER(IOCacheEnabled))(BOOL  aEnabled);
@@ -721 +724 @@
      */
     ChipsetType_T getChipsetType() const { return mHWData->mChipsetType; }
+    ParavirtProvider_T getParavirtProvider() const { return mHWData->mParavirtProvider; }
 
     void setModified(uint32_t fl, bool fAllowStateModification = true);

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

@@ -872 +872 @@
     uint32_t cbMcfgLength  = 0;
 
+    ParavirtProvider_T paravirtProvider;
+    hrc = pMachine->COMGETTER(ParavirtProvider)(&paravirtProvider);                         H();
+
     ChipsetType_T chipsetType;
     hrc = pMachine->COMGETTER(ChipsetType)(&chipsetType);                                   H();
@@ -1181 +1184 @@
             InsertConfigInteger(pRoot, "PowerOffInsteadOfReset", 1);
 
-
+        /*
+         * Paravirt. provider.
+         */
+        PCFGMNODE pParavirtNode;
+        InsertConfigNode(pRoot, "GIM", &pParavirtNode);
+        const char *pcszParavirtProvider;
+        switch (paravirtProvider)
+        {
+            case ParavirtProvider_None:
+                pcszParavirtProvider = "None";
+                break;
+
+            case ParavirtProvider_Default:  /** @todo Choose a provider based on guest OS type. There is no "Default" provider. */
+                pcszParavirtProvider = "None";
+                break;
+
+            case ParavirtProvider_Legacy:
+            {
+                if (fOsXGuest)
+                    pcszParavirtProvider = "Minimal";
+                else
+                    pcszParavirtProvider = "None";
+                break;
+            }
+
+            case ParavirtProvider_Minimal:
+                pcszParavirtProvider = "Minimal";
+                break;
+
+            case ParavirtProvider_HyperV:
+                pcszParavirtProvider = "HyperV";
+                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);
 
         /*

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2004-2013 Oracle Corporation
+ * Copyright (C) 2004-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -206 +206 @@
     mPointingHIDType = PointingHIDType_PS2Mouse;
     mChipsetType = ChipsetType_PIIX3;
+    mParavirtProvider = ParavirtProvider_Default;
     mEmulatedUSBCardReaderEnabled = FALSE;
 
@@ -1304 +1305 @@
             }
         }
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMGETTER(ParavirtProvider)(ParavirtProvider_T *aParavirtProvider)
+{
+    CheckComArgOutPointerValid(aParavirtProvider);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aParavirtProvider = mHWData->mParavirtProvider;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(ParavirtProvider)(ParavirtProvider_T aParavirtProvider)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
+
+    if (aParavirtProvider != mHWData->mParavirtProvider)
+    {
+        setModified(IsModified_MachineData);
+        mHWData.backup();
+        mHWData->mParavirtProvider = aParavirtProvider;
     }
 
@@ -9362 +9396 @@
         mHWData->mKeyboardHIDType = data.keyboardHIDType;
         mHWData->mChipsetType = data.chipsetType;
+        mHWData->mParavirtProvider = data.paravirtProvider;
         mHWData->mEmulatedUSBCardReaderEnabled = data.fEmulatedUSBCardReader;
         mHWData->mHPETEnabled = data.fHPETEnabled;
@@ -10637 +10672 @@
         data.chipsetType = mHWData->mChipsetType;
 
+        // paravirt
+        data.paravirtProvider = mHWData->mParavirtProvider;
+
         data.fEmulatedUSBCardReader = !!mHWData->mEmulatedUSBCardReaderEnabled;
 

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

@@ -55 +55 @@
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1913 +1913 @@
           keyboardHIDType(KeyboardHIDType_PS2Keyboard),
           chipsetType(ChipsetType_PIIX3),
+          paravirtProvider(ParavirtProvider_Legacy),
           fEmulatedUSBCardReader(false),
           clipboardMode(ClipboardMode_Disabled),
@@ -1987 +1988 @@
                   && (keyboardHIDType           == h.keyboardHIDType)
                   && (chipsetType               == h.chipsetType)
+                  && (paravirtProvider          == h.paravirtProvider)
                   && (fEmulatedUSBCardReader    == h.fEmulatedUSBCardReader)
                   && (vrdeSettings              == h.vrdeSettings)
@@ -2812 +2814 @@
                                           N_("Invalid value '%s' in Chipset/@type"),
                                           strChipsetType.c_str());
+            }
+        }
+        else if (pelmHwChild->nameEquals("Paravirt"))
+        {
+            Utf8Str strProvider;
+            if (pelmHwChild->getAttributeValue("provider", strProvider))
+            {
+                if (strProvider == "None")
+                    hw.paravirtProvider = ParavirtProvider_None;
+                else if (strProvider == "Default")
+                    hw.paravirtProvider = ParavirtProvider_Default;
+                else if (strProvider == "Legacy")
+                    hw.paravirtProvider = ParavirtProvider_Legacy;
+                else if (strProvider == "Minimal")
+                    hw.paravirtProvider = ParavirtProvider_Minimal;
+                else if (strProvider == "HyperV")
+                    hw.paravirtProvider = ParavirtProvider_HyperV;
+                else
+                    throw ConfigFileError(this,
+                                          pelmHwChild,
+                                          N_("Invalid value '%s' in Paravirt/@provider attribute"),
+                                          strProvider.c_str());
             }
         }
@@ -4116 +4140 @@
     }
 
+    if (    (m->sv >= SettingsVersion_v1_15)
+        && !hw.areParavirtDefaultSettings()
+       )
+    {
+        const char *pcszParavirtProvider;
+        switch (hw.paravirtProvider)
+        {
+            case ParavirtProvider_None:         pcszParavirtProvider = "None";     break;
+            case ParavirtProvider_Default:      pcszParavirtProvider = "Default";  break;
+            case ParavirtProvider_Legacy:       pcszParavirtProvider = "Legacy";   break;
+            case ParavirtProvider_Minimal:      pcszParavirtProvider = "Minimal";  break;
+            case ParavirtProvider_HyperV:       pcszParavirtProvider = "HyperV";   break;
+            default:            Assert(false);  pcszParavirtProvider = "None";     break;
+        }
+
+        xml::ElementNode *pelmParavirt = pelmHardware->createChild("Paravirt");
+        pelmParavirt->setAttribute("provider", pcszParavirtProvider);
+    }
+
     xml::ElementNode *pelmBoot = pelmHardware->createChild("Boot");
     for (BootOrderMap::const_iterator it = hw.mapBootOrder.begin();
@@ -5368 +5411 @@
     {
         /*
-         * Check whether the hotpluggable flag of all storage devices differs
-         * from the default for old settings.
-         * AHCI ports are hotpluggable by default every other device is not.
+         * Check whether a paravirtualization provider other than "Legacy" is used, if so bump the version.
          */
-        for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
-             it != storageMachine.llStorageControllers.end();
-             ++it)
-        {
-            bool fSettingsBumped = false;
-            const StorageController &sctl = *it;
-
-            for (AttachedDevicesList::const_iterator it2 = sctl.llAttachedDevices.begin();
-                 it2 != sctl.llAttachedDevices.end();
-                 ++it2)
-            {
-                const AttachedDevice &att = *it2;
-
-                if (   (   att.fHotPluggable
-                        && sctl.controllerType != StorageControllerType_IntelAhci)
-                    || (   !att.fHotPluggable
-                        && sctl.controllerType == StorageControllerType_IntelAhci))
+        if (hardwareMachine.paravirtProvider != ParavirtProvider_Legacy)
+            m->sv = SettingsVersion_v1_15;
+        else
+        {
+            /*
+             * Check whether the hotpluggable flag of all storage devices differs
+             * from the default for old settings.
+             * AHCI ports are hotpluggable by default every other device is not.
+             */
+            for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
+                 it != storageMachine.llStorageControllers.end();
+                 ++it)
+            {
+                bool fSettingsBumped = false;
+                const StorageController &sctl = *it;
+
+                for (AttachedDevicesList::const_iterator it2 = sctl.llAttachedDevices.begin();
+                     it2 != sctl.llAttachedDevices.end();
+                     ++it2)
                 {
-                    m->sv = SettingsVersion_v1_15;
-                    fSettingsBumped = true;
+                    const AttachedDevice &att = *it2;
+
+                    if (   (   att.fHotPluggable
+                            && sctl.controllerType != StorageControllerType_IntelAhci)
+                        || (   !att.fHotPluggable
+                            && sctl.controllerType == StorageControllerType_IntelAhci))
+                    {
+                        m->sv = SettingsVersion_v1_15;
+                        fSettingsBumped = true;
+                        break;
+                    }
+                }
+
+                /* Abort early if possible. */
+                if (fSettingsBumped)
                     break;
-                }
-            }
-
-            /* Abort early if possible. */
-            if (fSettingsBumped)
-                break;
+            }
         }
     }