The VM guest was turning off the TSC after using watchdog.
We tell it to use the tsc regardless. This is due to us not handling
the lapic timer properly.

Fixes: b/30568132

Signed-off-by: Gan Shun <[email protected]>
Change-Id: I7640ee2578ac7fb1c63b60b46fc279f78172fa2d
---
 kern/kfs/master_linux_cmdline | 1 +
 kern/kfs/tinycore_cmdline     | 1 +
 kern/kfs/vmimage_cmdline      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kern/kfs/master_linux_cmdline b/kern/kfs/master_linux_cmdline
index 17a9e06..0844bc9 100644
--- a/kern/kfs/master_linux_cmdline
+++ b/kern/kfs/master_linux_cmdline
@@ -10,5 +10,6 @@ earlyprintk=vmcall,keep
  init=/bin/launcher
  lapic=notscdeadline
  lapictimerfreq=1000000
+ clocksource=tsc
  pit=none
  noinvpcid
diff --git a/kern/kfs/tinycore_cmdline b/kern/kfs/tinycore_cmdline
index 10cfc14..ebc8faf 100644
--- a/kern/kfs/tinycore_cmdline
+++ b/kern/kfs/tinycore_cmdline
@@ -9,6 +9,7 @@ earlyprintk=vmcall,keep
  nohlt
  lapic=notscdeadline
  lapictimerfreq=1000000
+ clocksource=tsc
  pit=none
  nortc
  nozswap
diff --git a/kern/kfs/vmimage_cmdline b/kern/kfs/vmimage_cmdline
index b54cffa..093580a 100644
--- a/kern/kfs/vmimage_cmdline
+++ b/kern/kfs/vmimage_cmdline
@@ -9,5 +9,6 @@ earlyprintk=vmcall,keep
  init=/bin/sh
  lapic=notscdeadline
  lapictimerfreq=1000000
+ clocksource=tsc
  pit=none
  root=/dev/vda1
-- 
2.8.0.rc3.226.g39d4020

-- 
You received this message because you are subscribed to the Google Groups 
"Akaros" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to