Merge branch 'master' into player-14.1.7

misc: fix wrong directory name in INSTALL (fixes #36 )
Fix wrong directory name in one of the examples.
2019-09-09 08:41:52 +02:00 · 2019-09-09 08:38:27 +02:00 · 2019-07-31 13:58:13 +02:00 · 2019-07-22 06:57:08 +02:00
3 changed files with 3 additions and 2 deletions
@@ -150,7 +150,7 @@ test build).
 When using a downloaded tarball, simply run

  tar -cf vmmon.tar vmmon-only
-  tar -cf vmnet.tar vmmon-only
+  tar -cf vmnet.tar vmnet-only

 to create the tarballs. In this case, there is no protection against
 unwanted local changes.
@@ -251,6 +251,7 @@ static INLINE ub8 hash2(register const ub8 *k, /* the key */
  {
    /* c is reserved for the length */
  case  2: b+=k[1];
+	   /* fall through */
  case  1: a+=k[0];
    /* case 0: nothing left to add */
  }
@@ -3174,7 +3174,7 @@ HostIF_SetFastClockRate(unsigned int rate) // IN: Frequency in Hz.
      }
   } else {
      if (linuxState.fastClockThread) {
-         force_sig(SIGKILL, linuxState.fastClockThread);
+         send_sig(SIGKILL, linuxState.fastClockThread, 1);
         kthread_stop(linuxState.fastClockThread);

         linuxState.fastClockThread = NULL;
Author	SHA1	Message	Date
Michal Kubecek	d184686860	Merge branch 'master' into player-14.1.7	2019-09-09 08:41:52 +02:00
Michal Kubecek	85ede6aae9	misc: fix wrong directory name in INSTALL (fixes #36 ) Fix wrong directory name in one of the examples.	2019-09-09 08:38:27 +02:00
Michal Kubecek	26fb3d29e0	vmmon: mark expected switch fall through Since v5.3-rc2, kernel is built with -Wimplicit-fallthrough by default so that compiler warns about switch fall thgrough unless it is marked as expected. Add comment to mark one existing fall through as expected. Note: this function is no longer present in 15.1.0 and it is probably dead code anyway as hash2() is only called from HashFunc_HashPage() which does not seem to be called anywhere. But to keep the code as close to upstream as reasonably possible, just mark the fall through and keep both functions in place.	2019-07-31 13:58:13 +02:00
Michal Kubecek	4f88bce684	vmmon: fix HostIF_SetFastClockRate() not to use force_sig() Commit 3cf5d076fb4d ("signal: Remove task parameter from force_sig") in v5.3-rc1 drops second argument of force_sig(); before that, all callers which passed something else than current task as second argument were fixed, mostly to use send_sig() instead. The situation in HostIF_SetFastClockRate() is the same as e.g. in bpfilter call fixed by commit 1dfd1711de29 ("signal/bpfilter: Fix bpfilter_kernl to use send_sig not force_sig"): locking in force_sig_info() cannot handle task exiting and using force_sig() for SIGKILL is pointless anyway as this signal cannot be blocked. As send_sig() is present with unchanged signature since the pre-git era, we can use send_sig() unconditionally, regardless of kernel version.	2019-07-22 06:57:08 +02:00