Date: Wednesday, July 20, 2022 @ 22:41:41 Author: eworm Revision: 1254950
prepare for version 6.1.36 Modified: virtualbox/trunk/PKGBUILD Deleted: virtualbox/trunk/002-python310.patch virtualbox/trunk/003-pyunicode.patch virtualbox/trunk/019-vboxr0-cflags.patch virtualbox/trunk/020-linux518.patch -------------------------+ 002-python310.patch | 143 ----------------------- 003-pyunicode.patch | 26 ---- 019-vboxr0-cflags.patch | 18 -- 020-linux518.patch | 285 ---------------------------------------------- PKGBUILD | 18 -- 5 files changed, 5 insertions(+), 485 deletions(-) Deleted: 002-python310.patch =================================================================== --- 002-python310.patch 2022-07-20 21:26:07 UTC (rev 1254949) +++ 002-python310.patch 2022-07-20 22:41:41 UTC (rev 1254950) @@ -1,143 +0,0 @@ -# https://www.virtualbox.org/changeset/90537/vbox - -Index: trunk/configure -=================================================================== ---- trunk/configure (revision 90536) -+++ trunk/configure (revision 90537) -@@ -3,7 +3,7 @@ - # libraries VBox OSE depends on. - - # --# Copyright (C) 2006-2020 Oracle Corporation -+# Copyright (C) 2006-2021 Oracle Corporation - # - # This file is part of VirtualBox Open Source Edition (OSE), as - # available from http://www.virtualbox.org. This file is free software; -@@ -2043,7 +2043,7 @@ - } - EOF - found= -- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m" -+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m" - for p in $PYTHONDIR; do - for d in $SUPPYTHONLIBS; do - for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do -Index: trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp -=================================================================== ---- trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp (revision 90536) -+++ trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp (revision 90537) -@@ -84,7 +84,11 @@ - # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX) - # endif - # ifdef VBOX_PYXPCOM_VERSIONED --# if PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 -+# if PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000 -+# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_10") -+# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10) -+ -+# elif PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 - # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_9") - # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9) - -Index: trunk/src/libs/xpcom18a4/python/Makefile.kmk -=================================================================== ---- trunk/src/libs/xpcom18a4/python/Makefile.kmk (revision 90536) -+++ trunk/src/libs/xpcom18a4/python/Makefile.kmk (revision 90537) -@@ -4,7 +4,7 @@ - # - - # --# Copyright (C) 2009-2017 Oracle Corporation -+# Copyright (C) 2009-2021 Oracle Corporation - # - # This file is part of VirtualBox Open Source Edition (OSE), as - # available from http://www.virtualbox.org. This file is free software; -@@ -20,7 +20,7 @@ - - # - # List of supported Python versions, defining a number of --# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables -+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB] variables - # which get picked up below. - # - ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. -@@ -646,6 +646,52 @@ - endif - endif - -+ifdef VBOX_PYTHON310_INC -+# -+# Python 3.10 version -+# -+DLLS += VBoxPython3_10 -+VBoxPython3_10_EXTENDS = VBoxPythonBase -+VBoxPython3_10_EXTENDS_BY = appending -+VBoxPython3_10_TEMPLATE = XPCOM -+VBoxPython3_10_INCS = $(VBOX_PYTHON310_INC) -+VBoxPython3_10_LIBS = $(VBOX_PYTHON310_LIB) -+ -+ ifdef VBOX_WITH_32_ON_64_MAIN_API -+ ifdef VBOX_PYTHON310_LIB_X86 -+DLLS += VBoxPython3_10_x86 -+VBoxPython3_10_x86_EXTENDS = VBoxPythonBase_x86 -+VBoxPython3_10_x86_EXTENDS_BY = appending -+VBoxPython3_10_x86_TEMPLATE = XPCOM -+VBoxPython3_10_x86_INCS = $(VBOX_PYTHON310_INC) -+VBoxPython3_10_x86_LIBS = $(VBOX_PYTHON310_LIB_X86) -+ endif -+ endif -+endif -+ -+ifdef VBOX_PYTHON310M_INC -+# -+# Python 3.10 version with pymalloc -+# -+DLLS += VBoxPython3_10m -+VBoxPython3_10m_EXTENDS = VBoxPythonBase_m -+VBoxPython3_10m_EXTENDS_BY = appending -+VBoxPython3_10m_TEMPLATE = XPCOM -+VBoxPython3_10m_INCS = $(VBOX_PYTHON310M_INC) -+VBoxPython3_10m_LIBS = $(VBOX_PYTHON310M_LIB) -+ -+ ifdef VBOX_WITH_32_ON_64_MAIN_API -+ ifdef VBOX_PYTHON310M_LIB_X86 -+DLLS += VBoxPython3_10m_x86 -+VBoxPython3_10m_x86_EXTENDS = VBoxPythonBase_x86_m -+VBoxPython3_10m_x86_EXTENDS_BY = appending -+VBoxPython3_10m_x86_TEMPLATE_ = XPCOM -+VBoxPython3_10m_x86_INCS = $(VBOX_PYTHON310M_INC) -+VBoxPython3_10m_x86_LIBS = $(VBOX_PYTHON310M_LIB_X86) -+ endif -+ endif -+endif -+ - ifdef VBOX_PYTHONDEF_INC - # - # Python without versioning -@@ -730,4 +776,3 @@ - - - include $(FILE_KBUILD_SUB_FOOTER) -- -Index: trunk/src/libs/xpcom18a4/python/gen_python_deps.py -=================================================================== ---- trunk/src/libs/xpcom18a4/python/gen_python_deps.py (revision 90536) -+++ trunk/src/libs/xpcom18a4/python/gen_python_deps.py (revision 90537) -@@ -1,7 +1,7 @@ - #!/usr/bin/python - - """ --Copyright (C) 2009-2016 Oracle Corporation -+Copyright (C) 2009-2021 Oracle Corporation - - This file is part of VirtualBox Open Source Edition (OSE), as - available from http://www.virtualbox.org. This file is free software; -@@ -16,7 +16,7 @@ - import os,sys - from distutils.version import StrictVersion - --versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m" ] -+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m" ] - prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] - known = {} - Deleted: 003-pyunicode.patch =================================================================== --- 003-pyunicode.patch 2022-07-20 21:26:07 UTC (rev 1254949) +++ 003-pyunicode.patch 2022-07-20 22:41:41 UTC (rev 1254950) @@ -1,26 +0,0 @@ -# https://www.virtualbox.org/changeset/86623/vbox - -Index: trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h -=================================================================== ---- trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h (revision 86622) -+++ trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h (revision 86623) -@@ -137,12 +137,14 @@ - # define PyInt_Check(o) PyLong_Check(o) - # define PyInt_AsLong(o) PyLong_AsLong(o) - # define PyNumber_Int(o) PyNumber_Long(o) --# ifndef PyUnicode_AsUTF8 --# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) -+# if !defined(Py_LIMITED_API) && PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */ -+# ifndef PyUnicode_AsUTF8 -+# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) -+# endif -+# ifndef PyUnicode_AsUTF8AndSize -+# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) -+# endif - # endif --# ifndef PyUnicode_AsUTF8AndSize --# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) --# endif - typedef struct PyMethodChain - { - PyMethodDef *methods; Deleted: 019-vboxr0-cflags.patch =================================================================== --- 019-vboxr0-cflags.patch 2022-07-20 21:26:07 UTC (rev 1254949) +++ 019-vboxr0-cflags.patch 2022-07-20 22:41:41 UTC (rev 1254950) @@ -1,18 +0,0 @@ ---- a/Config.kmk -+++ b/Config.kmk -@@ -4502,11 +4502,14 @@ ifeq ($(VBOX_LDR_FMT),elf) - TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) - TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \ - $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ -- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) -+ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) - TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \ - $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ - $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \ - -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) -+ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++. -+TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding -+ endif - TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding - TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables - TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding Deleted: 020-linux518.patch =================================================================== --- 020-linux518.patch 2022-07-20 21:26:07 UTC (rev 1254949) +++ 020-linux518.patch 2022-07-20 22:41:41 UTC (rev 1254950) @@ -1,285 +0,0 @@ -Index: include/VBox/sup.h -=================================================================== ---- trunk/include/VBox/sup.h (revision 151556) -+++ trunk/include/VBox/sup.h (working copy) -@@ -2142,6 +2142,26 @@ - */ - SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void); - -+/** -+ * Notification from R0 VMM prior to loading the guest-FPU register state. -+ * -+ * @returns Whether the host-FPU register state has been saved by the host kernel. -+ * @param fCtxHook Whether thread-context hooks are enabled. -+ * -+ * @remarks Called with preemption disabled. -+ */ -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook); -+ -+/** -+ * Notification from R0 VMM prior to saving the guest-FPU register state (and -+ * potentially restoring the host-FPU register state) in ring-0. -+ * -+ * @param fCtxHook Whether thread-context hooks are enabled. -+ * -+ * @remarks Called with preemption disabled. -+ */ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook); -+ - /** @copydoc RTLogGetDefaultInstanceEx - * @remarks To allow overriding RTLogGetDefaultInstanceEx locally. */ - SUPR0DECL(struct RTLOGGER *) SUPR0GetDefaultLogInstanceEx(uint32_t fFlagsAndGroup); -Index: src/VBox/Additions/linux/sharedfolders/regops.c -=================================================================== ---- trunk/src/VBox/Additions/linux/sharedfolders/regops.c (revision 151556) -+++ trunk/src/VBox/Additions/linux/sharedfolders/regops.c (working copy) -@@ -3823,7 +3823,9 @@ - .readpage = vbsf_readpage, - .writepage = vbsf_writepage, - /** @todo Need .writepages if we want msync performance... */ --#if RTLNX_VER_MIN(2,5,12) -+#if RTLNX_VER_MIN(5,18,0) -+ .dirty_folio = filemap_dirty_folio, -+#elif RTLNX_VER_MIN(2,5,12) - .set_page_dirty = __set_page_dirty_buffers, - #endif - #if RTLNX_VER_MIN(5,14,0) -Index: src/VBox/Additions -=================================================================== ---- trunk/src/VBox/Additions (revision 151556) -+++ trunk/src/VBox/Additions (working copy) - -Property changes on: src/VBox/Additions -___________________________________________________________________ -Modified: svn:mergeinfo -## -0,0 +0,1 ## - Merged /trunk/src/VBox/Additions:r150844 -Index: src/VBox/HostDrivers/Support/SUPDrv.cpp -=================================================================== ---- trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp (revision 151556) -+++ trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp (working copy) -@@ -98,6 +98,18 @@ - # endif - #endif - -+#if defined(RT_OS_LINUX) && !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE) -+/* In Linux 5.18-rc1, memcpy became a wrapper which does fortify checks -+ * before triggering __underlying_memcpy() call. We do not pass these checks here, -+ * so bypass them for now. */ -+# if RTLNX_VER_MIN(5,18,0) -+# define SUPDRV_MEMCPY __underlying_memcpy -+# else -+# define SUPDRV_MEMCPY memcpy -+# endif -+#else -+# define SUPDRV_MEMCPY memcpy -+#endif - - /* - * Logging assignments: -@@ -266,6 +278,8 @@ - SUPEXP_STK_BACK( 2, SUPR0ContFree), - SUPEXP_STK_BACK( 2, SUPR0ChangeCR4), - SUPEXP_STK_BACK( 1, SUPR0EnableVTx), -+ SUPEXP_STK_OKAY( 1, SUPR0FpuBegin), -+ SUPEXP_STK_OKAY( 1, SUPR0FpuEnd), - SUPEXP_STK_BACK( 0, SUPR0SuspendVTxOnCpu), - SUPEXP_STK_BACK( 1, SUPR0ResumeVTxOnCpu), - SUPEXP_STK_OKAY( 1, SUPR0GetCurrentGdtRw), -@@ -1742,7 +1756,7 @@ - - /* execute */ - pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions); -- memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions)); -+ SUPDRV_MEMCPY(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions)); - pReq->Hdr.rc = VINF_SUCCESS; - return 0; - } -Index: src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp -=================================================================== ---- trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (revision 151556) -+++ trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (working copy) -@@ -2002,6 +2002,18 @@ - } - - -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ - /* - * - * org_virtualbox_SupDrv -Index: src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c -=================================================================== ---- trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c (revision 151556) -+++ trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c (working copy) -@@ -640,3 +640,16 @@ - return 0; - } - -+ -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ -Index: src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -=================================================================== ---- trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (revision 151556) -+++ trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (working copy) -@@ -1454,6 +1454,31 @@ - } - - -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+#if RTLNX_VER_MIN(5,18,0) -+ kernel_fpu_begin(); -+ /* if (fCtxHook) */ -+ preempt_enable(); /* HACK ALERT! undo the implicit preempt_disable() in kernel_fpu_begin(). */ -+ return true; -+#else -+ return false; -+#endif -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+#if RTLNX_VER_MIN(5,18,0) -+ /* if (fCtxHook) */ -+ preempt_disable(); /* HACK ALERT! undo the implicit preempt_enable() in SUPR0FpuBegin(). */ -+ kernel_fpu_end(); -+#endif -+} -+ -+ - int VBOXCALL supdrvOSGetCurrentGdtRw(RTHCUINTPTR *pGdtRw) - { - #if RTLNX_VER_MIN(4,12,0) -Index: src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp -=================================================================== ---- trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp (revision 151556) -+++ trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp (working copy) -@@ -541,3 +541,16 @@ - return 0; - } - -+ -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ -Index: src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c -=================================================================== ---- trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (revision 151556) -+++ trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (working copy) -@@ -1309,3 +1309,16 @@ - return 0; - } - -+ -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ -Index: src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp -=================================================================== ---- trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (revision 151556) -+++ trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (working copy) -@@ -2704,6 +2704,19 @@ - } - - -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ -+ - SUPR0DECL(int) SUPR0IoCtlSetupForHandle(PSUPDRVSESSION pSession, intptr_t hHandle, uint32_t fFlags, PSUPR0IOCTLCTX *ppCtx) - { - /* -Index: src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -=================================================================== ---- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (revision 151556) -+++ trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (working copy) -@@ -2311,7 +2311,13 @@ - vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1); - Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb)); - Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf)); -+#if RTLNX_VER_MIN(5,18,0) -+ local_bh_disable(); -+ err = netif_rx(pBuf); -+ local_bh_enable(); -+#else - err = netif_rx_ni(pBuf); -+#endif - if (err) - rc = RTErrConvertFromErrno(err); - } -Index: src/VBox/VMM/VMMR0/CPUMR0.cpp -=================================================================== ---- trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp (revision 151556) -+++ trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp (working copy) -@@ -440,6 +440,9 @@ - Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST)); - Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE)); - -+ /* Notify the support driver prior to loading the guest-FPU register state. */ -+ SUPR0FpuBegin(false /* unused */); -+ - if (!pVM->cpum.s.HostFeatures.fLeakyFxSR) - { - Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE)); -@@ -484,6 +487,9 @@ - Assert(ASMGetCR4() & X86_CR4_OSFXSR); - if (pVCpu->cpum.s.fUseFlags & (CPUM_USED_FPU_GUEST | CPUM_USED_FPU_HOST)) - { -+ /* Notify the support driver prior to loading the host-FPU register state. */ -+ SUPR0FpuEnd(false /* unused */); -+ - fSavedGuest = RT_BOOL(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST); - if (!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE)) - cpumR0SaveGuestRestoreHostFPUState(&pVCpu->cpum.s); Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-07-20 21:26:07 UTC (rev 1254949) +++ PKGBUILD 2022-07-20 22:41:41 UTC (rev 1254950) @@ -8,9 +8,9 @@ 'virtualbox-guest-utils' 'virtualbox-guest-utils-nox' 'virtualbox-ext-vnc') -pkgver=6.1.34 +pkgver=6.1.36 _tarver=${pkgver} -pkgrel=4 +pkgrel=0 arch=('x86_64') url='https://virtualbox.org/' license=('GPL' 'custom') @@ -64,8 +64,6 @@ 'vboxweb.service' 'vboxreload' '001-disable-update.patch' - '002-python310.patch' - '003-pyunicode.patch' '004-drop-Wno-format.patch' '005-gsoap-build.patch' '006-rdesktop-vrdp-keymap-path.patch' @@ -74,10 +72,8 @@ '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' '013-Makefile.patch' '017-fix-narrowing-conversion.patch' - '018-xclient.patch' - '019-vboxr0-cflags.patch' - '020-linux518.patch') -sha256sums=('9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49' + '018-xclient.patch') +sha256sums=('e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047' '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e' @@ -91,8 +87,6 @@ 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d' '9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b' - '361a6de4fd91070f3e34d4a59b086a84c8a38c707f44b6db82b658d9076f69ce' - '3bb1643a212b9ecb4d75e31add984a6b206f71a9f46f460007812d1ce648c1a0' '2ef32b9f6df4c5489751de36446f29825b4602048ee6d5e59573e4b01c8f4846' '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab' @@ -101,9 +95,7 @@ '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99' - 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3' - '25066d566042a3b3d6dee805fe783ca07fd3c3671a098db2b5f09aeb07624cd2' - '3ea54e5a747086c388d078b12117cdb640a937e3147b71031abcff2497ff1e97') + 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3') prepare() { cd "VirtualBox-$pkgver"
