VirtualBox

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/xml/Settings.cpp

    r76598 r76678  
    30683068    fSpecCtrl(false),
    30693069    fSpecCtrlByHost(false),
     3070    fL1DFlushOnSched(true),
     3071    fL1DFlushOnVMEntry(false),
    30703072    fNestedHWVirt(false),
    30713073    enmLongMode(HC_ARCH_BITS == 64 ? Hardware::LongMode_Enabled : Hardware::LongMode_Disabled),
    … …  
    32013203            && fSpecCtrl                 == h.fSpecCtrl
    32023204            && fSpecCtrlByHost           == h.fSpecCtrlByHost
     3205            && fL1DFlushOnSched          == h.fL1DFlushOnSched
     3206            && fL1DFlushOnVMEntry        == h.fL1DFlushOnVMEntry
    32033207            && fNestedHWVirt             == h.fNestedHWVirt
    32043208            && cCPUs                     == h.cCPUs
    … …  
    42214225            if (pelmCPUChild)
    42224226                pelmCPUChild->getAttributeValue("enabled", hw.fSpecCtrlByHost);
     4227            pelmCPUChild = pelmHwChild->findChildElement("L1DFlushOn");
     4228            if (pelmCPUChild)
     4229            {
     4230                pelmCPUChild->getAttributeValue("scheduling", hw.fL1DFlushOnSched);
     4231                pelmCPUChild->getAttributeValue("vmentry", hw.fL1DFlushOnVMEntry);
     4232            }
    42234233            pelmCPUChild = pelmHwChild->findChildElement("NestedHWVirt");
    42244234            if (pelmCPUChild)
    … …  
    55815591                pelmChild->setAttribute("vmentry", hw.fIBPBOnVMEntry);
    55825592        }
    5583     }
    5584     if (m->sv >= SettingsVersion_v1_16 && hw.fSpecCtrl)
    5585         pelmCPU->createChild("SpecCtrl")->setAttribute("enabled", hw.fSpecCtrl);
    5586     if (m->sv >= SettingsVersion_v1_16 && hw.fSpecCtrlByHost)
    5587         pelmCPU->createChild("SpecCtrlByHost")->setAttribute("enabled", hw.fSpecCtrlByHost);
     5593        if (hw.fSpecCtrl)
     5594            pelmCPU->createChild("SpecCtrl")->setAttribute("enabled", hw.fSpecCtrl);
     5595        if (hw.fSpecCtrlByHost)
     5596            pelmCPU->createChild("SpecCtrlByHost")->setAttribute("enabled", hw.fSpecCtrlByHost);
     5597        if (!hw.fL1DFlushOnSched || hw.fL1DFlushOnVMEntry)
     5598        {
     5599            xml::ElementNode *pelmChild = pelmCPU->createChild("L1DFlushOn");
     5600            if (!hw.fL1DFlushOnSched)
     5601                pelmChild->setAttribute("scheduling", hw.fL1DFlushOnSched);
     5602            if (hw.fL1DFlushOnVMEntry)
     5603                pelmChild->setAttribute("vmentry", hw.fL1DFlushOnVMEntry);
     5604        }
     5605    }
    55885606    if (m->sv >= SettingsVersion_v1_17 && hw.fNestedHWVirt)
    55895607        pelmCPU->createChild("NestedHWVirt")->setAttribute("enabled", hw.fNestedHWVirt);
    … …  
    73467364            || hardwareMachine.fIBPBOnVMEntry
    73477365            || hardwareMachine.fSpecCtrl
    7348             || hardwareMachine.fSpecCtrlByHost)
     7366            || hardwareMachine.fSpecCtrlByHost
     7367            || !hardwareMachine.fL1DFlushOnSched
     7368            || hardwareMachine.fL1DFlushOnVMEntry)
    73497369        {
    73507370            m->sv = SettingsVersion_v1_16;
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