Changeset 70606 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Jan 16, 2018 7:05:36 PM (7 years ago)

Author:

vboxsync

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

120319

Message:

updates (bugref:9087)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Main/xml/Settings.cpp (modified) (5 diffs)

trunk

@@ -8 +8 @@
 /branches/VBox-5.0:104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
 /branches/VBox-5.1:112367,115992,116543,116550,116568,116573
+/branches/VBox-5.2:120083,120099,120213,120221,120239
 /branches/andy/draganddrop:90781-91268
 /branches/andy/guestctrl20:78916,78930

@@ -8 +8 @@
 /branches/VBox-5.0:104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
 /branches/VBox-5.1:112367,115992,116543,116550,116568,116573
+/branches/VBox-5.2:120083,120099,120213,120221,120239
 /branches/andy/draganddrop:90781-91268
 /branches/andy/guestctrl20:78916,78930

trunk/src/VBox

@@ -8 +8 @@
 /branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
 /branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
+/branches/VBox-5.2/src/VBox:120083,120099,120213,120221,120239
 /branches/andy/draganddrop/src/VBox:90781-91268
 /branches/andy/guestctrl20/src/VBox:78916,78930

@@ -8 +8 @@
 /branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
 /branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
+/branches/VBox-5.2/src/VBox:120083,120099,120213,120221,120239
 /branches/andy/draganddrop/src/VBox:90781-91268
 /branches/andy/guestctrl20/src/VBox:78916,78930

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

@@ -2778 +2778 @@
     fAPIC(true),
     fX2APIC(false),
+    fIBPBOnVMExit(false),
+    fIBPBOnVMEntry(false),
     enmLongMode(HC_ARCH_BITS == 64 ? Hardware::LongMode_Enabled : Hardware::LongMode_Disabled),
     cCPUs(1),
@@ -2931 +2933 @@
             && fAPIC                     == h.fAPIC
             && fX2APIC                   == h.fX2APIC
+            && fIBPBOnVMExit             == h.fIBPBOnVMExit
+            && fIBPBOnVMEntry            == h.fIBPBOnVMEntry
             && cCPUs                     == h.cCPUs
             && fCpuHotPlug               == h.fCpuHotPlug
@@ -3933 +3937 @@
             if (hw.fX2APIC)
                 hw.fAPIC = true;
+            pelmCPUChild = pelmHwChild->findChildElement("IBPBOn");
+            if (pelmCPUChild)
+            {
+                pelmCPUChild->getAttributeValue("vmexit", hw.fIBPBOnVMExit);
+                pelmCPUChild->getAttributeValue("vmentry", hw.fIBPBOnVMEntry);
+            }
 
             if ((pelmCPUChild = pelmHwChild->findChildElement("CpuIdTree")))
@@ -5259 +5269 @@
     if (m->sv >= SettingsVersion_v1_16)
     {
+        if (hw.fIBPBOnVMEntry || hw.fIBPBOnVMExit)
+        {
+            xml::ElementNode *pelmChild = pelmCPU->createChild("IBPBOn");
+            if (hw.fIBPBOnVMExit)
+                pelmChild->setAttribute("vmexit", hw.fIBPBOnVMExit);
+            if (hw.fIBPBOnVMEntry)
+                pelmChild->setAttribute("vmentry", hw.fIBPBOnVMEntry);
+        }
     }
     if (m->sv >= SettingsVersion_v1_14 && hw.enmLongMode != Hardware::LongMode_Legacy)
@@ -6930 +6948 @@
             || hardwareMachine.biosSettings.apicMode != APICMode_APIC
             || !hardwareMachine.fAPIC
-            || hardwareMachine.fX2APIC)
+            || hardwareMachine.fX2APIC
+            || hardwareMachine.fIBPBOnVMExit
+            || hardwareMachine.fIBPBOnVMEntry)
         {
             m->sv = SettingsVersion_v1_16;

@@ -8 +8 @@
 /branches/VBox-5.0:104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
 /branches/VBox-5.1:112367,115992,116543,116550,116568,116573
+/branches/VBox-5.2:120083,120099,120213,120221,120239
 /branches/andy/draganddrop:90781-91268
 /branches/andy/guestctrl20:78916,78930

@@ -8 +8 @@
 /branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
 /branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
+/branches/VBox-5.2/src/VBox:120083,120099,120213,120221,120239
 /branches/andy/draganddrop/src/VBox:90781-91268
 /branches/andy/guestctrl20/src/VBox:78916,78930