From 79506e44940d7a1b3f46e286c3b181b773a7c858 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Fri, 9 Aug 2024 11:34:49 +0200 Subject: [PATCH] vbox5: disable xsave some more adjustments are needed for xsave support, but this port is scheduled to be removed. Just disable xsave for the time being to make nightly test happy. Issue #5314 --- repos/ports/ports/virtualbox5.hash | 2 +- repos/ports/src/virtualbox5/patches/series | 1 + repos/ports/src/virtualbox5/patches/xsave.patch | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 repos/ports/src/virtualbox5/patches/xsave.patch diff --git a/repos/ports/ports/virtualbox5.hash b/repos/ports/ports/virtualbox5.hash index 9467c611c6..2ae7d2e15f 100644 --- a/repos/ports/ports/virtualbox5.hash +++ b/repos/ports/ports/virtualbox5.hash @@ -1 +1 @@ -4df67ce24bce24be1c0171bfb9eef96a42e95c6f +ad357d2e6af6a8a056563d082190e357cf63a083 diff --git a/repos/ports/src/virtualbox5/patches/series b/repos/ports/src/virtualbox5/patches/series index ce5b70cd3b..96342f1ecb 100644 --- a/repos/ports/src/virtualbox5/patches/series +++ b/repos/ports/src/virtualbox5/patches/series @@ -38,3 +38,4 @@ register.patch changeset82265.patch drvvd.patch narrowing.patch +xsave.patch diff --git a/repos/ports/src/virtualbox5/patches/xsave.patch b/repos/ports/src/virtualbox5/patches/xsave.patch new file mode 100644 index 0000000000..6a396bfcb6 --- /dev/null +++ b/repos/ports/src/virtualbox5/patches/xsave.patch @@ -0,0 +1,14 @@ +--- a/src/app/virtualbox/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp +--- b/src/app/virtualbox/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp +@@ -1735,6 +1735,11 @@ + pFeatures->fClFlush = RT_BOOL(pStd1Leaf->uEdx & X86_CPUID_FEATURE_EDX_CLFSH); + pFeatures->fPcid = RT_BOOL(pStd1Leaf->uEcx & X86_CPUID_FEATURE_ECX_PCID); + ++ if (pFeatures->fXSaveRstor) { ++ RTLogPrintf("disable XSAVE feature forcefully\n"); ++ pFeatures->fXSaveRstor = 0; ++ } ++ + /* Structured extended features. */ + PCCPUMCPUIDLEAF const pSxfLeaf0 = cpumR3CpuIdFindLeafEx(paLeaves, cLeaves, 7, 0); + if (pSxfLeaf0)