From patchwork Mon Aug 8 00:58:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asias He X-Patchwork-Id: 1042892 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 p780xIGx026317 for ; Mon, 8 Aug 2011 00:59:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752114Ab1HHA7M (ORCPT ); Sun, 7 Aug 2011 20:59:12 -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 S1752066Ab1HHA7J (ORCPT ); Sun, 7 Aug 2011 20:59:09 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so7394479pzk.1 for ; Sun, 07 Aug 2011 17:59:09 -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:in-reply-to:references; bh=TAjL6lCmaZG5JrUhFbD46mEU4Y5bOSgDTvD19/hcBDQ=; b=shX4LKmv7OBPjwuz52s3kbzCV5TtpPdWG1Fd6WTHA2EOnH0w10VapP8wowOGH54uti E8GQNpNuLOxMpuce20BXPtT+iJpRaacyqrjl0QyGarkPDXdZ6EEhWwMTmNbqVKaDXZmo lSkZ9vGeJQLBHklhXPYBGFf+4jJ6rDDH6Ipy8= Received: by 10.143.69.12 with SMTP id w12mr5056151wfk.298.1312765149302; Sun, 07 Aug 2011 17:59:09 -0700 (PDT) Received: from localhost.localdomain ([219.224.169.130]) by mx.google.com with ESMTPS id l7sm5745792pbh.58.2011.08.07.17.59.06 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 07 Aug 2011 17:59:08 -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 4/4] kvm tools: Tune --disk option usage information Date: Mon, 8 Aug 2011 08:58:12 +0800 Message-Id: <1312765092-21190-4-git-send-email-asias.hejun@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1312765092-21190-1-git-send-email-asias.hejun@gmail.com> References: <1312765092-21190-1-git-send-email-asias.hejun@gmail.com> 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:19 +0000 (UTC) This patch makes --disk option usage information include rootfs direcotry, since --disk supports both iamges and rootfs dir. Signed-off-by: Asias He --- tools/kvm/builtin-run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index 4279cb3..21eee70 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -158,7 +158,7 @@ static const struct option options[] = { "A name for the guest"), OPT_INTEGER('c', "cpus", &nrcpus, "Number of CPUs"), OPT_U64('m', "mem", &ram_size, "Virtual machine memory size in MiB."), - OPT_CALLBACK('d', "disk", NULL, "image", "Disk image", img_name_parser), + OPT_CALLBACK('d', "disk", NULL, "image or rootfs_dir", "Disk image or rootfs directory", img_name_parser), OPT_BOOLEAN('\0', "balloon", &balloon, "Enable virtio balloon"), OPT_BOOLEAN('\0', "vnc", &vnc, "Enable VNC framebuffer"), OPT_BOOLEAN('\0', "sdl", &sdl, "Enable SDL framebuffer"),