From patchwork Wed May 11 18:01:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pekka Enberg X-Patchwork-Id: 777852 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 p4BI1slM000963 for ; Wed, 11 May 2011 18:01:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754100Ab1EKSBu (ORCPT ); Wed, 11 May 2011 14:01:50 -0400 Received: from filtteri1.pp.htv.fi ([213.243.153.184]:56957 "EHLO filtteri1.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754076Ab1EKSBt (ORCPT ); Wed, 11 May 2011 14:01:49 -0400 Received: from localhost (localhost [127.0.0.1]) by filtteri1.pp.htv.fi (Postfix) with ESMTP id 2D2A08BBDA; Wed, 11 May 2011 21:01:48 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp6.welho.com ([213.243.153.40]) by localhost (filtteri1.pp.htv.fi [213.243.153.184]) (amavisd-new, port 10024) with ESMTP id PA3IwRu6UctL; Wed, 11 May 2011 21:01:47 +0300 (EEST) Received: from localhost.localdomain (cs181148025.pp.htv.fi [82.181.148.25]) by smtp6.welho.com (Postfix) with ESMTP id C2EB55BC007; Wed, 11 May 2011 21:01:47 +0300 (EEST) From: Pekka Enberg To: kvm@vger.kernel.org Cc: Pekka Enberg , Asias He , Avi Kivity , Cyrill Gorcunov , Ingo Molnar , Prasad Joshi , Sasha Levin Subject: [PATCH 1/2] kvm tools: Use '-c' for '--cpus', not '--console' Date: Wed, 11 May 2011 21:01:45 +0300 Message-Id: <1305136906-14496-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, 11 May 2011 18:01:54 +0000 (UTC) This patch changes the '-c' command line option to specify the number of CPUs because it's used more often than console switching. Cc: Asias He Cc: Avi Kivity Cc: Cyrill Gorcunov Cc: Ingo Molnar Cc: Prasad Joshi Cc: Sasha Levin Signed-off-by: Pekka Enberg --- tools/kvm/kvm-run.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c index 829b33f..9b5176f 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -97,10 +97,10 @@ static int img_name_parser(const struct option *opt, const char *arg, int unset) static const struct option options[] = { OPT_GROUP("Basic options:"), - OPT_INTEGER('\0', "cpus", &nrcpus, "Number of CPUs"), + OPT_INTEGER('c', "cpus", &nrcpus, "Number of CPUs"), OPT_U64('m', "mem", &ram_size, "Virtual machine memory size in MiB."), OPT_CALLBACK('i', "image", NULL, "image", "Disk image", img_name_parser), - OPT_STRING('c', "console", &console, "serial or virtio", + OPT_STRING('\0', "console", &console, "serial or virtio", "Console to use"), OPT_BOOLEAN('\0', "virtio-rng", &virtio_rng, "Enable virtio Random Number Generator"),