Changeset 70606 in vbox for trunk/src/VBox/Main/src-server/MachineImpl.cpp

Timestamp:

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

Author:

vboxsync

Message:

updates (bugref:9087)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Main/src-server/MachineImpl.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/src-server/MachineImpl.cpp

@@ -196 +196 @@
     mAPIC = true;
     mX2APIC = false;
+    mIBPBOnVMExit = false;
+    mIBPBOnVMEntry = false;
     mHPETEnabled = false;
     mCpuExecutionCap = 100; /* Maximum CPU execution cap by default. */
@@ -2256 +2258 @@
             break;
 
+        case CPUPropertyType_IBPBOnVMExit:
+            *aValue = mHWData->mIBPBOnVMExit;
+            break;
+
+        case CPUPropertyType_IBPBOnVMEntry:
+            *aValue = mHWData->mIBPBOnVMEntry;
+            break;
+
         default:
             return E_INVALIDARG;
@@ -2303 +2313 @@
             if (aValue)
                 mHWData->mAPIC = !!aValue;
+            break;
+
+        case CPUPropertyType_IBPBOnVMExit:
+            i_setModified(IsModified_MachineData);
+            mHWData.backup();
+            mHWData->mIBPBOnVMExit = !!aValue;
+            break;
+
+        case CPUPropertyType_IBPBOnVMEntry:
+            i_setModified(IsModified_MachineData);
+            mHWData.backup();
+            mHWData->mIBPBOnVMEntry = !!aValue;
             break;
 
@@ -8988 +9010 @@
         mHWData->mAPIC                        = data.fAPIC;
         mHWData->mX2APIC                      = data.fX2APIC;
+        mHWData->mIBPBOnVMExit                = data.fIBPBOnVMExit;
+        mHWData->mIBPBOnVMEntry               = data.fIBPBOnVMEntry;
         mHWData->mCPUCount                    = data.cCPUs;
         mHWData->mCPUHotPlugEnabled           = data.fCpuHotPlug;
@@ -10311 +10335 @@
         data.fAPIC                  = !!mHWData->mAPIC;
         data.fX2APIC                = !!mHWData->mX2APIC;
+        data.fIBPBOnVMExit          = !!mHWData->mIBPBOnVMExit;
+        data.fIBPBOnVMEntry         = !!mHWData->mIBPBOnVMEntry;
         data.cCPUs                  = mHWData->mCPUCount;
         data.fCpuHotPlug            = !!mHWData->mCPUHotPlugEnabled;

@@ -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