diff options
| author | jkim <jkim@FreeBSD.org> | 2016-08-13 12:05:35 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-08-13 12:05:35 +0800 |
| commit | c0e265299cdf066aca287c8fb29b77f427754fd2 (patch) | |
| tree | 648b699a260e28620438aea4eea9376bf63c407d /emulators | |
| parent | 1f8f0a1ce1110848c7296d9bb02b7a36dc770a1b (diff) | |
| download | freebsd-ports-gnome-c0e265299cdf066aca287c8fb29b77f427754fd2.tar.gz freebsd-ports-gnome-c0e265299cdf066aca287c8fb29b77f427754fd2.tar.zst freebsd-ports-gnome-c0e265299cdf066aca287c8fb29b77f427754fd2.zip | |
Temporarily disable AVX support for guest. It is unstable for FreeBSD.
PR: 211651
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/virtualbox-ose/Makefile | 1 | ||||
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_CPUMR3CpuId.cpp | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 89420c856878..bbe965ab35f1 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.0.26 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_CPUMR3CpuId.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_CPUMR3CpuId.cpp new file mode 100644 index 000000000000..7d7b2bdc212a --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_CPUMR3CpuId.cpp @@ -0,0 +1,21 @@ +--- src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp.orig 2016-07-18 11:57:09 UTC ++++ src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp +@@ -3797,6 +3797,10 @@ static int cpumR3CpuIdReadConfig(PVM pVM + rc = cpumR3CpuIdReadIsaExtCfgLegacy(pVM, pIsaExts, pCpumCfg, "SSE4.2", &pConfig->enmSse42, true); + AssertLogRelRCReturn(rc, rc); + ++#ifdef __FreeBSD__ ++ // XXX PR211651: Disable XSAVE/XRSTOR for guest ++ bool const fMayHaveXSave = false; ++#else + bool const fMayHaveXSave = fNestedPagingAndFullGuestExec + && pVM->cpum.s.HostFeatures.fXSaveRstor + && pVM->cpum.s.HostFeatures.fOpSysXSaveRstor +@@ -3804,6 +3808,7 @@ static int cpumR3CpuIdReadConfig(PVM pVM + && !HMIsLongModeAllowed(pVM) + #endif + ; ++#endif + uint64_t const fXStateHostMask = pVM->cpum.s.fXStateHostMask; + + /** @cfgm{/CPUM/IsaExts/XSAVE, boolean, depends} |