From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Sun, 4 Jul 2010 10:18:59 +0000 (+0300)
Subject: kvm: Use 'nopci pci=off' kernel parameters by default
X-Git-Tag: next-20110824~3^2~528^2~118
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f74a81ac8e5088a3086a263e97630a6f511e595;p=karo-tx-linux.git

kvm: Use 'nopci pci=off' kernel parameters by default

As pointed out by Cyrill, use 'nopci pci=off' by default to avoid the need for
emulating PCI.

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

diff --git a/tools/kvm/main.c b/tools/kvm/main.c
index 9223f93bf5ca..e2e5d775b5f1 100644
--- a/tools/kvm/main.c
+++ b/tools/kvm/main.c
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 
 	kvm__setup_cpuid(kvm);
 
-	strcpy(real_cmdline, "notsc nolapic nosmp noacpi earlyprintk=serial,keep ");
+	strcpy(real_cmdline, "notsc nolapic nosmp noacpi nopci pci=off earlyprintk=serial,keep ");
 	if (kernel_cmdline) {
 		strlcat(real_cmdline, kernel_cmdline, sizeof(real_cmdline));
 		real_cmdline[sizeof(real_cmdline)-1] = '\0';