From patchwork Wed Apr 6 15:48:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pekka Enberg X-Patchwork-Id: 690071 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p36FmRUW026669 for ; Wed, 6 Apr 2011 15:48:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932151Ab1DFPsY (ORCPT ); Wed, 6 Apr 2011 11:48:24 -0400 Received: from filtteri6.pp.htv.fi ([213.243.153.189]:60264 "EHLO filtteri6.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932101Ab1DFPsY (ORCPT ); Wed, 6 Apr 2011 11:48:24 -0400 Received: from localhost (localhost [127.0.0.1]) by filtteri6.pp.htv.fi (Postfix) with ESMTP id DF85862A045; Wed, 6 Apr 2011 18:48:22 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp5.welho.com ([213.243.153.39]) by localhost (filtteri6.pp.htv.fi [213.243.153.189]) (amavisd-new, port 10024) with ESMTP id 7vEGNWRlvg03; Wed, 6 Apr 2011 18:48:22 +0300 (EEST) Received: from localhost.localdomain (cs181148025.pp.htv.fi [82.181.148.25]) by smtp5.welho.com (Postfix) with ESMTP id 8417C5BC004; Wed, 6 Apr 2011 18:48:22 +0300 (EEST) From: Pekka Enberg To: kvm@vger.kernel.org Cc: Pekka Enberg , Asias He , Cyrill Gorcunov Subject: [PATCH] kvm tools: Drop hard-coded 'nosmp' kernel parameter Date: Wed, 6 Apr 2011 18:48:17 +0300 Message-Id: <1302104897-5591-1-git-send-email-penberg@kernel.org> X-Mailer: git-send-email 1.7.0.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Apr 2011 15:48:28 +0000 (UTC) As noted by Cyrill, there's no need to pass 'nosmp' to the guest kernel because it'll switch to PIC after noticing APIC is not available. Cc: Asias He Cc: Cyrill Gorcunov Signed-off-by: Pekka Enberg --- tools/kvm/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/kvm/main.c b/tools/kvm/main.c index 1eeb311..6065661 100644 --- a/tools/kvm/main.c +++ b/tools/kvm/main.c @@ -148,7 +148,7 @@ int main(int argc, char *argv[]) kvm__setup_cpuid(kvm); - strcpy(real_cmdline, "notsc nolapic nosmp noacpi pci=conf1 console=ttyS0 "); + strcpy(real_cmdline, "notsc nolapic noacpi pci=conf1 console=ttyS0 "); if (!kernel_cmdline || !strstr(kernel_cmdline, "root=")) strlcat(real_cmdline, "root=/dev/vda rw ", sizeof(real_cmdline));