Changeset 58437 in vbox for trunk/src/VBox

Timestamp:

Oct 27, 2015 4:17:12 PM (9 years ago)

Author:

vboxsync

Message:

Main: Added paravirtdebug options.

Location:

trunk/src/VBox

Files:

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

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

@@ -683 +683 @@
                      "                            [--paravirtprovider none|default|legacy|minimal|\n"
                      "                                                hyperv|kvm]\n"
+                     "                            [--paravirtdebug [<settings>]\n"
                      "                            [--hwvirtex on|off]\n"
                      "                            [--nestedpaging on|off]\n"

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

@@ -745 +745 @@
         RTPrintf("Paravirt. Provider: %s\n", pszParavirtProvider);
 
+    Bstr paravirtDebug;
+    CHECK_ERROR2I_RET(machine, COMGETTER(ParavirtDebug)(paravirtDebug.asOutParam()), hrcCheck);
+    if (paravirtDebug.isNotEmpty())
+    {
+        if (details == VMINFO_MACHINEREADABLE)
+            RTPrintf("paravirtdebug=\"%ls\"\n", paravirtDebug.raw());
+        else
+            RTPrintf("Paravirt. Debug: %ls\n", paravirtDebug.raw());
+    }
 
     MachineState_T machineState;

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

@@ -64 +64 @@
     MODIFYVM_TFRESET,
     MODIFYVM_PARAVIRTPROVIDER,
+    MODIFYVM_PARAVIRTDEBUG,
     MODIFYVM_HWVIRTEX,
     MODIFYVM_NESTEDPAGING,
@@ -232 +233 @@
     { "--triplefaultreset",         MODIFYVM_TFRESET,                   RTGETOPT_REQ_BOOL_ONOFF },
     { "--paravirtprovider",         MODIFYVM_PARAVIRTPROVIDER,          RTGETOPT_REQ_STRING },
+    { "--paravirtdebug",            MODIFYVM_PARAVIRTDEBUG,             RTGETOPT_REQ_STRING },
     { "--hwvirtex",                 MODIFYVM_HWVIRTEX,                  RTGETOPT_REQ_BOOL_ONOFF },
     { "--nestedpaging",             MODIFYVM_NESTEDPAGING,              RTGETOPT_REQ_BOOL_ONOFF },
@@ -688 +690 @@
             }
 
+            case MODIFYVM_PARAVIRTDEBUG:
+            {
+                CHECK_ERROR(sessionMachine, COMSETTER(ParavirtDebug)(Bstr(ValueUnion.psz).raw()));
+                break;
+            }
+
             case MODIFYVM_HWVIRTEX:
             {

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

@@ -1052 +1052 @@
       <desc>Microsoft Hyper-V.</desc>
     </const>
-        <const name="KVM"      value="5">
-          <desc>Linux KVM.</desc>
-        </const>
+    <const name="KVM"      value="5">
+      <desc>Linux KVM.</desc>
+    </const>
   </enum>
 
@@ -4207 +4207 @@
     wrap-hint-server-addinterfaces="IInternalMachineControl"
     wrap-hint-server="manualaddinterfaces"
-    reservedMethods="8" reservedAttributes="16"
+    reservedMethods="8" reservedAttributes="14"
     >
     <desc>
@@ -5044 +5044 @@
           This attribute is currently not implemented.
         </result>
+      </desc>
+    </attribute>
+
+    <attribute name="paravirtDebug" type="wstring">
+      <desc>
+        Debug parameters for the paravirtualized guest interface provider.
       </desc>
     </attribute>

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

@@ -314 +314 @@
         ChipsetType_T       mChipsetType;
         ParavirtProvider_T  mParavirtProvider;
+        Utf8Str             mParavirtDebug;
         BOOL                mEmulatedUSBCardReaderEnabled;
 
@@ -501 +502 @@
     ChipsetType_T i_getChipsetType() const { return mHWData->mChipsetType; }
     ParavirtProvider_T i_getParavirtProvider() const { return mHWData->mParavirtProvider; }
+    Utf8Str i_getParavirtDebug() const { return mHWData->mParavirtDebug; }
 
     void i_setModified(uint32_t fl, bool fAllowStateModification = true);
@@ -958 +960 @@
     HRESULT getParavirtProvider(ParavirtProvider_T *aParavirtProvider);
     HRESULT setParavirtProvider(ParavirtProvider_T aParavirtProvider);
+    HRESULT getParavirtDebug(com::Utf8Str &aParavirtDebug);
+    HRESULT setParavirtDebug(const com::Utf8Str &aParavirtDebug);
     HRESULT getFaultToleranceState(FaultToleranceState_T *aFaultToleranceState);
     HRESULT setFaultToleranceState(FaultToleranceState_T aFaultToleranceState);

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

@@ -946 +946 @@
     hrc = pMachine->GetEffectiveParavirtProvider(&paravirtProvider);                        H();
 
+    Bstr strParavirtDebug;
+    hrc = pMachine->COMGETTER(ParavirtDebug)(strParavirtDebug.asOutParam());                H();
+
     ChipsetType_T chipsetType;
     hrc = pMachine->COMGETTER(ChipsetType)(&chipsetType);                                   H();
@@ -1290 +1293 @@
 
         /*
+         * Parse paravirt. debug options.
+         */
+        bool         fGimDebug          = false;
+        com::Utf8Str strGimDebugAddress = "127.0.0.1";
+        uint32_t     uGimDebugPort      = 50000;
+        if (strParavirtDebug.isNotEmpty())
+        {
+            /* Hyper-V debug options. */
+            if (paravirtProvider == ParavirtProvider_HyperV)
+            {
+                bool         fGimHvDebug = false;
+                com::Utf8Str strGimHvVendor;
+                bool         fGimHvVsIf;
+                bool         fGimHvHypercallIf;
+
+                size_t       uPos = 0;
+                com::Utf8Str strDebugOptions = strParavirtDebug;
+                do
+                {
+                    com::Utf8Str strKey;
+                    com::Utf8Str strVal;
+                    uPos = strDebugOptions.parseKeyValue(strKey, strVal, uPos);
+                    if (   strKey == "enabled"
+                        && strVal.toUInt32() == 1)
+                    {
+                        /* Apply defaults. */
+                        fGimHvDebug       = true;
+                        strGimHvVendor    = "Microsoft Hv";
+                        fGimHvVsIf        = true;
+                        fGimHvHypercallIf = false;
+                    }
+                    else if (strKey == "address")
+                        strGimDebugAddress = strVal;
+                    else if (strKey == "port")
+                        uGimDebugPort = strVal.toUInt32();
+                    else if (strKey == "vendor")
+                        strGimHvVendor = strVal;
+                    else if (strKey == "vsinterface")
+                        fGimHvVsIf = RT_BOOL(strVal.toUInt32());
+                    else if (strKey == "hypercallinterface")
+                        fGimHvHypercallIf = RT_BOOL(strVal.toUInt32());
+                } while (uPos != com::Utf8Str::npos);
+
+                /* Update HyperV CFGM node with active debug options. */
+                if (fGimHvDebug)
+                {
+                    PCFGMNODE pHvNode;
+                    InsertConfigNode(pParavirtNode, "HyperV", &pHvNode);
+                    InsertConfigString(pHvNode,  "VendorID", strGimHvVendor);
+                    InsertConfigInteger(pHvNode, "VSInterface", fGimHvVsIf ? 1 : 0);
+                    InsertConfigInteger(pHvNode, "HypercallDebugInterface", fGimHvHypercallIf ? 1 : 0);
+                    fGimDebug = true;
+                }
+            }
+        }
+
+        /*
          * MM values.
          */
@@ -1411 +1471 @@
             //InsertConfigNode(pInst,    "Config", &pCfg);
 
-            InsertConfigNode(pInst,     "LUN#998", &pLunL0);
-            InsertConfigString(pLunL0,  "Driver", "UDP");
-            InsertConfigNode(pLunL0,    "Config", &pLunL1);
-            InsertConfigString(pLunL1,  "ServerAddress", "127.0.0.1");
-            InsertConfigInteger(pLunL1, "ServerPort", 50000);
+            if (fGimDebug)
+            {
+                InsertConfigNode(pInst,     "LUN#998", &pLunL0);
+                InsertConfigString(pLunL0,  "Driver", "UDP");
+                InsertConfigNode(pLunL0,    "Config", &pLunL1);
+                InsertConfigString(pLunL1,  "ServerAddress", strGimDebugAddress);
+                InsertConfigInteger(pLunL1, "ServerPort", uGimDebugPort);
+            }
         }
 

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

@@ -1213 +1213 @@
             }
         }
+    }
+
+    return S_OK;
+}
+
+HRESULT Machine::getParavirtDebug(com::Utf8Str &aParavirtDebug)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    aParavirtDebug = mHWData->mParavirtDebug;
+    return S_OK;
+}
+
+HRESULT Machine::setParavirtDebug(const com::Utf8Str &aParavirtDebug)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = i_checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
+
+    /** @todo Parse/validate options? */
+    if (aParavirtDebug != mHWData->mParavirtDebug)
+    {
+        i_setModified(IsModified_MachineData);
+        mHWData.backup();
+        mHWData->mParavirtDebug = aParavirtDebug;
     }
 
@@ -8913 +8939 @@
         mHWData->mChipsetType = data.chipsetType;
         mHWData->mParavirtProvider = data.paravirtProvider;
+        mHWData->mParavirtDebug = data.strParavirtDebug;
         mHWData->mEmulatedUSBCardReaderEnabled = data.fEmulatedUSBCardReader;
         mHWData->mHPETEnabled = data.fHPETEnabled;
@@ -10195 +10222 @@
         // paravirt
         data.paravirtProvider = mHWData->mParavirtProvider;
-
-
+        data.strParavirtDebug = mHWData->mParavirtDebug;
+
+        // emulated USB card reader
         data.fEmulatedUSBCardReader = !!mHWData->mEmulatedUSBCardReaderEnabled;
 

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

@@ -1997 +1997 @@
           chipsetType(ChipsetType_PIIX3),
           paravirtProvider(ParavirtProvider_Legacy),
+          strParavirtDebug(""),
           fEmulatedUSBCardReader(false),
           clipboardMode(ClipboardMode_Disabled),
@@ -2074 +2075 @@
                   && (chipsetType               == h.chipsetType)
                   && (paravirtProvider          == h.paravirtProvider)
+                  && (strParavirtDebug          == h.strParavirtDebug)
                   && (fEmulatedUSBCardReader    == h.fEmulatedUSBCardReader)
                   && (vrdeSettings              == h.vrdeSettings)
@@ -2969 +2971 @@
                                           strProvider.c_str());
             }
+
+            Utf8Str strDebug;
+            if (pelmHwChild->getAttributeValue("debug", strDebug))
+                hw.strParavirtDebug = strDebug;
         }
         else if (pelmHwChild->nameEquals("HPET"))
@@ -4296 +4302 @@
         xml::ElementNode *pelmParavirt = pelmHardware->createChild("Paravirt");
         pelmParavirt->setAttribute("provider", pcszParavirtProvider);
+
+        if (   m->sv >= SettingsVersion_v1_16
+            && hw.strParavirtDebug.isNotEmpty())
+            pelmParavirt->setAttribute("debug", hw.strParavirtDebug);
     }
 
@@ -5594 +5604 @@
     if (m->sv < SettingsVersion_v1_16)
     {
-        // VirtualBox 5.1 adds a NVMe storage controller.
+        // VirtualBox 5.1 adds a NVMe storage controller, paravirt debug options.
         for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
              it != storageMachine.llStorageControllers.end();
@@ -5606 +5616 @@
                 return;
             }
+        }
+
+        if (hardwareMachine.strParavirtDebug.isNotEmpty())
+        {
+            m->sv = SettingsVersion_v1_16;
+            return;
         }
     }