From patchwork Fri Dec 6 16:36:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 298116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C140B2C00A8 for ; Sat, 7 Dec 2013 04:16:52 +1100 (EST) Received: from localhost ([::1]:60151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoygW-00063V-Q7 for incoming@patchwork.ozlabs.org; Fri, 06 Dec 2013 11:55:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoyQ6-0000EG-6I for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:38:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoyPz-0003sT-2N for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:38:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoyPy-0003sF-QJ for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:38:18 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rB6GcFfi014491 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 6 Dec 2013 11:38:16 -0500 Received: from localhost (ovpn-112-22.ams2.redhat.com [10.36.112.22]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rB6GcEUJ017604; Fri, 6 Dec 2013 11:38:15 -0500 From: Stefan Hajnoczi To: Date: Fri, 6 Dec 2013 17:36:35 +0100 Message-Id: <1386347807-27359-37-git-send-email-stefanha@redhat.com> In-Reply-To: <1386347807-27359-1-git-send-email-stefanha@redhat.com> References: <1386347807-27359-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Stefan Hajnoczi , Wenchao Xia , Anthony Liguori Subject: [Qemu-devel] [PULL 36/48] qemu-nbd: add doc for option -f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Wenchao Xia Signed-off-by: Wenchao Xia Signed-off-by: Stefan Hajnoczi --- qemu-nbd.c | 1 + qemu-nbd.texi | 2 ++ 2 files changed, 3 insertions(+) diff --git a/qemu-nbd.c b/qemu-nbd.c index fe6053c..136e8c9 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -79,6 +79,7 @@ static void usage(const char *name) #endif "\n" "Block device options:\n" +" -f, --format=FORMAT set image format (raw, qcow2, ...)\n" " -r, --read-only export read-only\n" " -s, --snapshot use FILE as an external snapshot, create a temporary\n" " file with backing_file=FILE, redirect the write to\n" diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 5b55f76..0a7e013 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -22,6 +22,8 @@ Export QEMU disk image using NBD protocol. interface to bind to (default @samp{0.0.0.0}) @item -k, --socket=@var{path} Use a unix socket with path @var{path} +@item -f, --format=@var{format} + Set image format as @var{format} @item -r, --read-only export read-only @item -P, --partition=@var{num}