VirtualBox

Changeset 76678 in vbox for trunk/src/VBox/Main/src-server


Ignore:
Timestamp:
Jan 7, 2019 1:48:16 PM (6 years ago)
Author:
vboxsync
Message:

Port r124260, r124263, r124271, r124273, r124277, r124278, r124279, r124284, r124285, r124286, r124287, r124288, r124289 and r124290 (Ported fixes over from 5.2, see bugref:9179 for more information)

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:mergeinfo

      •  

        old new  
        88/branches/VBox-5.0:104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
        99/branches/VBox-5.1:112367,115992,116543,116550,116568,116573
        10 /branches/VBox-5.2:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,125768,125779-125780,125812
         10/branches/VBox-5.2:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124260,124263,124271,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812
        1111/branches/andy/draganddrop:90781-91268
        1212/branches/andy/guestctrl20:78916,78930

  • trunk/src/VBox

    • Property svn:mergeinfo

      •  

        old new  
        88/branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
        99/branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
        10 /branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,125768,125779-125780,125812
         10/branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124263,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812
        1111/branches/andy/draganddrop/src/VBox:90781-91268
        1212/branches/andy/guestctrl20/src/VBox:78916,78930

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

    r76592 r76678  
    196196    mSpecCtrl = false;
    197197    mSpecCtrlByHost = false;
     198    mL1DFlushOnSched = true;
     199    mL1DFlushOnVMEntry = false;
    198200    mNestedHWVirt = false;
    199201    mHPETEnabled = false;
    … …  
    20252027            break;
    20262028
     2029        case CPUPropertyType_L1DFlushOnEMTScheduling:
     2030            *aValue = mHWData->mL1DFlushOnSched;
     2031            break;
     2032
     2033        case CPUPropertyType_L1DFlushOnVMEntry:
     2034            *aValue = mHWData->mL1DFlushOnVMEntry;
     2035            break;
     2036
    20272037        default:
    20282038            return E_INVALIDARG;
    … …  
    21022112            mHWData.backup();
    21032113            mHWData->mNestedHWVirt = !!aValue;
     2114            break;
     2115
     2116        case CPUPropertyType_L1DFlushOnEMTScheduling:
     2117            i_setModified(IsModified_MachineData);
     2118            mHWData.backup();
     2119            mHWData->mL1DFlushOnSched = !!aValue;
     2120            break;
     2121
     2122        case CPUPropertyType_L1DFlushOnVMEntry:
     2123            i_setModified(IsModified_MachineData);
     2124            mHWData.backup();
     2125            mHWData->mL1DFlushOnVMEntry = !!aValue;
    21042126            break;
    21052127
    … …  
    88368858        mHWData->mSpecCtrl                    = data.fSpecCtrl;
    88378859        mHWData->mSpecCtrlByHost              = data.fSpecCtrlByHost;
     8860        mHWData->mL1DFlushOnSched             = data.fL1DFlushOnSched;
     8861        mHWData->mL1DFlushOnVMEntry           = data.fL1DFlushOnVMEntry;
    88388862        mHWData->mNestedHWVirt                = data.fNestedHWVirt;
    88398863        mHWData->mCPUCount                    = data.cCPUs;
    … …  
    1015710181        data.fSpecCtrl              = !!mHWData->mSpecCtrl;
    1015810182        data.fSpecCtrlByHost        = !!mHWData->mSpecCtrlByHost;
     10183        data.fL1DFlushOnSched       = !!mHWData->mL1DFlushOnSched;
     10184        data.fL1DFlushOnVMEntry     = !!mHWData->mL1DFlushOnVMEntry;
    1015910185        data.fNestedHWVirt          = !!mHWData->mNestedHWVirt;
    1016010186        data.cCPUs                  = mHWData->mCPUCount;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette