From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Sun, 11 Apr 2010 17:55:56 +0000 (+0300)
Subject: kvm: Force 'notsc' and 'earlyprintk' kernel parameters
X-Git-Tag: next-20110824~3^2~528^2~162
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=513fa5b4ccba8f9a2270a4f5262433071456540b;p=karo-tx-linux.git

kvm: Force 'notsc' and 'earlyprintk' kernel parameters

We don't support TSC calibration properly and we want early printk so force
them as kernel parameters.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---

diff --git a/tools/kvm/main.c b/tools/kvm/main.c
index 61253fdecd04..df8b7871b353 100644
--- a/tools/kvm/main.c
+++ b/tools/kvm/main.c
@@ -21,6 +21,7 @@ int main(int argc, char *argv[])
 	const char *kernel_filename = NULL;
 	const char *kernel_cmdline = NULL;
 	bool single_step = false;
+	char real_cmdline[128];
 	struct kvm *kvm;
 	int i;
 
@@ -51,7 +52,11 @@ int main(int argc, char *argv[])
 
 	kvm__setup_cpuid(kvm);
 
-	if (!kvm__load_kernel(kvm, kernel_filename, kernel_cmdline))
+	strcpy(real_cmdline, "notsc earlyprintk=serial,keep ");
+	if (kernel_cmdline)
+		strcat(real_cmdline, kernel_cmdline);
+
+	if (!kvm__load_kernel(kvm, kernel_filename, real_cmdline))
 		die("unable to load kernel %s", kernel_filename);
 
 	kvm__reset_vcpu(kvm);