Update to 14.1.0

4 files changed, 34 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75044e19b335..34e35bffecd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vmware-workstation
 	pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC.
-	pkgver = 14.0.0
-	pkgrel = 3
+	pkgver = 14.1.0
+	pkgrel = 1
 	url = https://www.vmware.com/products/workstation-for-linux.html
 	install = vmware-workstation.install
 	arch = x86_64
@@ -35,7 +35,7 @@ pkgbase = vmware-workstation
 	backup = etc/vmware/ssl/hostd.ssl.config
 	backup = etc/pam.d/vmware-authd
 	backup = etc/conf.d/vmware
-	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-14.0.0-6661328.x86_64.bundle
+	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-14.1.0-7370693.x86_64.bundle
 	source = bootstrap
 	source = config
 	source = pam.d-vmware-authd
@@ -54,10 +54,10 @@ pkgbase = vmware-workstation
 	source = Makefile
 	source = vmmon.patch
 	source = vmnet.patch
-	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.0.1/6754183/packages/com.vmware.fusion.tools.darwinPre15.zip.tar
-	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.0.1/6754183/packages/com.vmware.fusion.tools.darwin.zip.tar
+	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.0/7370838/packages/com.vmware.fusion.tools.darwinPre15.zip.tar
+	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.0/7370838/packages/com.vmware.fusion.tools.darwin.zip.tar
 	source = unlocker.py
-	sha256sums = f758e06d302b339c23f9c498d6dbf8a0182cfdfb71e4cdcc209ecfb68e20500a
+	sha256sums = 522f368c3ce009b4cd442c25215b022fc09a520a668b4e3189af5194f50ca14a
 	sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e
 	sha256sums = d9a5f8b919d52aa2f279d8eaf0bb495780eb9fd8bbc2c58bba223cdca78cc991
 	sha256sums = d50aa0a3fe94025178965d988e18d41eb60aa1ce2b28ee6e3ca15edeabfa2ca7
@@ -74,10 +74,10 @@ pkgbase = vmware-workstation
 	sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d
 	sha256sums = 05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487
 	sha256sums = 6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d
-	sha256sums = a3a02e3daff9a122d4d7f45df9555b6e94e3030e024cc9a59890ace5252453cd
-	sha256sums = 4f07320c1f9e71e649cf3e98ec107ba5521d52e50ad781ccc9dc1b61817342ae
-	sha256sums = 3aeee4ddad2e94e5dbd8da3f995ad3f887f35a241d82e8c64a22f792c159cc44
-	sha256sums = 2c6076d55da659723fb7b7871baaee95df3bdcd90e448955ed1ec53df6a1f2d0
+	sha256sums = 773442cea744a6bd6420c4a0108749d33dae5ac7e7813c99a6fbfdf47963e9da
+	sha256sums = 5d69ef50ed407c4948db424549ffb38321c7d1203ba6cd153f6fb3351364aa34
+	sha256sums = 70ee05c2e6098644a619fd0e1f742facd5f234e62d7095ef99186e8af8d6b882
+	sha256sums = a18688c5ccbebe3822f71a357e879bec6dd9a5698833d13fd0f27ee72adab1fc
 	sha256sums = b739b0c99fb20dc44838ce137e254773b7be051f327eb67fd8cb1342a3ecf344
 
 pkgname = vmware-workstation
diff --git a/PKGBUILD b/PKGBUILD
index 0a39c1166eed..6eb7975e974b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,10 @@
 
 #PKGEXT=.pkg.tar
 pkgname=vmware-workstation
-pkgver=14.0.0
-_buildver=6661328
+pkgver=14.1.0
+_buildver=7370693
 _pkgver=${pkgver}_${_buildver}
-pkgrel=3
+pkgrel=1
 pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.'
 arch=(x86_64)
 url='https://www.vmware.com/products/workstation-for-linux.html'
@@ -88,7 +88,7 @@ source=(
   'vmnet.patch'
 )
 sha256sums=(
-  'f758e06d302b339c23f9c498d6dbf8a0182cfdfb71e4cdcc209ecfb68e20500a'
+  '522f368c3ce009b4cd442c25215b022fc09a520a668b4e3189af5194f50ca14a'
 
   '12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e'
   'd9a5f8b919d52aa2f279d8eaf0bb495780eb9fd8bbc2c58bba223cdca78cc991'
@@ -109,8 +109,8 @@ sha256sums=(
 
   '05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487'
   '6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d'
-  'a3a02e3daff9a122d4d7f45df9555b6e94e3030e024cc9a59890ace5252453cd'
-  '4f07320c1f9e71e649cf3e98ec107ba5521d52e50ad781ccc9dc1b61817342ae'
+  '773442cea744a6bd6420c4a0108749d33dae5ac7e7813c99a6fbfdf47963e9da'
+  '5d69ef50ed407c4948db424549ffb38321c7d1203ba6cd153f6fb3351364aa34'
 )
 options=(!strip emptydirs)
 
@@ -119,7 +119,7 @@ _isoimages=(freebsd linux linuxPreGlibc25 netware solaris windows winPre2k winPr
 
 if [ -n "$_enable_macOS_guests" ]; then
 
-_vmware_fusion_ver=10.0.1_6754183
+_vmware_fusion_ver=10.1.0_7370838
 # List of VMware Fusion versions: https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 
 makedepends+=(
@@ -133,8 +133,8 @@ source+=(
   'unlocker.py'
 )
 sha256sums+=(
-  '3aeee4ddad2e94e5dbd8da3f995ad3f887f35a241d82e8c64a22f792c159cc44'
-  '2c6076d55da659723fb7b7871baaee95df3bdcd90e448955ed1ec53df6a1f2d0'
+  '70ee05c2e6098644a619fd0e1f742facd5f234e62d7095ef99186e8af8d6b882'
+  'a18688c5ccbebe3822f71a357e879bec6dd9a5698833d13fd0f27ee72adab1fc'
   'b739b0c99fb20dc44838ce137e254773b7be051f327eb67fd8cb1342a3ecf344'
 )
 
diff --git a/vmmon.patch b/vmmon.patch
index ae0850d972e2..74af6f8e7893 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -50,17 +50,17 @@ new file mode 100644
 index 0000000..b68d9b2
 --- /dev/null
 +++ b/vmmon-only/include/compat_timer.h
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,33 @@
 +#ifndef __COMPAT_TIMER_H__
 +#define __COMPAT_TIMER_H__
 +
 +#include <linux/timer.h>
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)) && !defined(timer_setup)
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)) && !defined(timer_setup)
 +
 +typedef unsigned long compat_timer_arg_t;
 +
-+static inline void timer_setup(struct timer_list *timer,
++static inline void compat_timer_setup(struct timer_list *timer,
 +				      void (*func)(compat_timer_arg_t),
 +				      unsigned int flags)
 +{
@@ -74,6 +74,13 @@ index 0000000..b68d9b2
 +
 +typedef struct timer_list *compat_timer_arg_t;
 +
++static inline void compat_timer_setup(struct timer_list *timer,
++				      void (*func)(compat_timer_arg_t),
++				      unsigned int flags)
++{
++	timer_setup(timer, func, flags);
++}
++
 +#endif /* new timer interface since 4.15 */
 +
 +#endif /* __COMPAT_TIMER_H__ */
@@ -151,7 +158,7 @@ index 87cf45b..5390a93 100644
  
     HostIF_InitUptime();
 -   init_timer(&tscTimer);
-+   timer_setup(&tscTimer, LinuxDriverEstimateTSCkHzDeferred, 0);
++   compat_timer_setup(&tscTimer, LinuxDriverEstimateTSCkHzDeferred, 0);
     LinuxDriverInitTSCkHz();
     Vmx86_InitIDList();
  
@@ -205,44 +212,6 @@ index fd32013..583d6da 100644
  #include <linux/hrtimer.h>
  #include <linux/signal.h>
  #include <linux/taskstats_kern.h> // For linux/sched/signal.h without version check
-@@ -75,6 +79,37 @@
- #include "pgtbl.h"
- #include "versioned_atomic.h"
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-+#   define global_zone_page_state global_page_state
-+#endif
-+
-+static unsigned long get_nr_slab_unreclaimable(void)
-+{
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)
-+   return global_node_page_state(NR_SLAB_UNRECLAIMABLE);
-+#else
-+   return global_page_state(NR_SLAB_UNRECLAIMABLE);
-+#endif
-+}
-+
-+static unsigned long get_nr_unevictable(void)
-+{
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+   return global_node_page_state(NR_UNEVICTABLE);
-+#else
-+   return global_page_state(NR_UNEVICTABLE);
-+#endif
-+}
-+
-+static unsigned long get_nr_anon_mapped(void)
-+{
-+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+   return global_node_page_state(NR_ANON_MAPPED);
-+ #else
-+   return global_page_state(NR_ANON_PAGES);
-+ #endif
-+}
-+
- #if !defined(CONFIG_HIGH_RES_TIMERS)
- #error CONFIG_HIGH_RES_TIMERS required for acceptable performance
- #endif
 @@ -115,6 +149,10 @@
   */
  #define LOCKED_PAGE_SLACK 10000
@@ -254,28 +223,7 @@ index fd32013..583d6da 100644
  static struct {
     Atomic_uint64     uptimeBase;
     VersionedAtomic   version;
-@@ -1516,16 +1555,11 @@ HostIF_EstimateLockedPageLimit(const VMDriver* vm,                // IN
-    unsigned int reservedPages = MEMDEFAULTS_MIN_HOST_PAGES;
-    unsigned int hugePages = (vm == NULL) ? 0 :
-       BYTES_2_PAGES(vm->memInfo.hugePageBytes);
--   unsigned int lockedPages = global_page_state(NR_PAGETABLE) +
--                              global_page_state(NR_SLAB_UNRECLAIMABLE) +
--                              global_page_state(NR_UNEVICTABLE) +
-+   unsigned int lockedPages = global_zone_page_state(NR_PAGETABLE) +
-+                              get_nr_slab_unreclaimable() +
-+                              get_nr_unevictable() +
-                               hugePages + reservedPages;
--   unsigned int anonPages =
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
--      global_page_state(NR_ANON_MAPPED);
--#else
--      global_page_state(NR_ANON_PAGES);
--#endif
-+   unsigned int anonPages = get_nr_anon_mapped();
-    unsigned int swapPages = BYTES_2_PAGES(linuxState.swapSize);
- 
-    if (anonPages > swapPages) {
-@@ -1688,7 +1723,7 @@ HostIFReadUptimeWork(unsigned long *j)  // OUT: current jiffies
+@@ -1705,7 +1714,7 @@ HostIFReadUptimeWork(unsigned long *j)  // OUT: current jiffies
   */
  
  static void
@@ -284,13 +232,13 @@ index fd32013..583d6da 100644
  {
     unsigned long jifs;
     uintptr_t flags;
-@@ -1750,8 +1785,7 @@ HostIF_InitUptime(void)
+@@ -1767,8 +1776,7 @@ HostIF_InitUptime(void)
                    -(tv.tv_usec * (UPTIME_FREQ / 1000000) +
                      tv.tv_sec * UPTIME_FREQ));
  
 -   init_timer(&uptimeState.timer);
 -   uptimeState.timer.function = HostIFUptimeResyncMono;
-+   timer_setup(&uptimeState.timer, HostIFUptimeResyncMono, 0);
++   compat_timer_setup(&uptimeState.timer, HostIFUptimeResyncMono, 0);
     mod_timer(&uptimeState.timer, jiffies + HZ);
  }
  
diff --git a/vmnet.patch b/vmnet.patch
index 867a75f361e2..32ac223bd9b3 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -24,9 +24,9 @@ index 2d8e6f6..a14166b 100644
  
 -EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
 +EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netif_trans_update.c,-DVMW_NETIF_TRANS_UPDATE, )
  
  obj-m += $(DRIVER).o
- 
 diff --git a/vmnet/driver.c b/vmnet/driver.c
 index 7e7ad99..5f508f6 100644
 --- a/vmnet/driver.c