From patchwork Mon Aug 8 00:58:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asias He X-Patchwork-Id: 1042882 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p780xIGu026317 for ; Mon, 8 Aug 2011 00:59:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751613Ab1HHA7A (ORCPT ); Sun, 7 Aug 2011 20:59:00 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:50127 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751917Ab1HHA7A (ORCPT ); Sun, 7 Aug 2011 20:59:00 -0400 Received: by pzk37 with SMTP id 37so7394479pzk.1 for ; Sun, 07 Aug 2011 17:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=jidymz7wItHwcNH+LSUhw4Id4Jymg2PSflBzGEMHLw4=; b=b0vlPGt2/O6+i45J2MWWZPCxsicBCygu4P70aTEnS/0394ti0nrv2zE8cHASTtpFTK uy9ozA6v6PuXfgNRbX5WipAmhtfHZVgz5674if7uJUkbXL5Q1CSWky0ffuhjn8pPcr+F 9ORecQgAKiO0+RNYaInMOclkdHAop4a/LkNFU= Received: by 10.142.122.26 with SMTP id u26mr5119453wfc.353.1312765139534; Sun, 07 Aug 2011 17:58:59 -0700 (PDT) Received: from localhost.localdomain ([219.224.169.130]) by mx.google.com with ESMTPS id l7sm5745792pbh.58.2011.08.07.17.58.56 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 07 Aug 2011 17:58:58 -0700 (PDT) From: Asias He To: Pekka Enberg Cc: Cyrill Gorcunov , Ingo Molnar , Sasha Levin , Prasad Joshi , kvm@vger.kernel.org, Asias He Subject: [PATCH 1/4] kvm tools: Make --kvm-dev option shorter Date: Mon, 8 Aug 2011 08:58:09 +0800 Message-Id: <1312765092-21190-1-git-send-email-asias.hejun@gmail.com> X-Mailer: git-send-email 1.7.5.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]); Mon, 08 Aug 2011 00:59:18 +0000 (UTC) This patch changes --kvm-dev to --dev. Signed-off-by: Asias He --- tools/kvm/Documentation/kvm-run.txt | 3 +-- tools/kvm/builtin-run.c | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/kvm/Documentation/kvm-run.txt b/tools/kvm/Documentation/kvm-run.txt index a4e0fe7..6513427 100644 --- a/tools/kvm/Documentation/kvm-run.txt +++ b/tools/kvm/Documentation/kvm-run.txt @@ -32,8 +32,7 @@ OPTIONS --kernel=:: The virtual machine kernel. --d ---kvm-dev=:: +--dev=:: KVM device file. -i:: diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index c8539cc..18e76b0 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -68,7 +68,7 @@ static const char *vmlinux_filename; static const char *initrd_filename; static const char *image_filename[MAX_DISK_IMAGES]; static const char *console; -static const char *kvm_dev; +static const char *dev; static const char *network; static const char *host_ip; static const char *guest_ip; @@ -163,7 +163,7 @@ static const struct option options[] = { "Console to use"), OPT_INCR('\0', "rng", &virtio_rng, "Enable virtio Random Number Generator"), - OPT_STRING('\0', "kvm-dev", &kvm_dev, "kvm-dev", "KVM device file"), + OPT_STRING('\0', "dev", &dev, "device_file", "KVM device file"), OPT_CALLBACK('\0', "virtio-9p", NULL, "dirname,tag_name", "Enable 9p over virtio", virtio_9p_rootdir_parser), OPT_BOOLEAN('\0', "balloon", &balloon, "Enable virtio balloon"), @@ -557,8 +557,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) ram_size <<= MB_SHIFT; - if (!kvm_dev) - kvm_dev = DEFAULT_KVM_DEV; + if (!dev) + dev = DEFAULT_KVM_DEV; if (!console) console = DEFAULT_CONSOLE; @@ -592,7 +592,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) guest_name = default_name; } - kvm = kvm__init(kvm_dev, ram_size, guest_name); + kvm = kvm__init(dev, ram_size, guest_name); irq__init(kvm);