From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com,
Wenchao Xia <xiawenc@linux.vnet.ibm.com>,
stefanha@gmail.com
Subject: [Qemu-devel] [PATCH V3 6/7] qemu-img: add doc for param -L in convert
Date: Thu, 26 Sep 2013 08:16:07 +0800 [thread overview]
Message-ID: <1380154568-5339-7-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1380154568-5339-1-git-send-email-xiawenc@linux.vnet.ibm.com>
Also renamed snapshot_name to snapshot_id_or_name to tip better.
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
qemu-img-cmds.hx | 2 +-
qemu-img.c | 2 ++
qemu-img.texi | 7 +++++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
index da1d965..39f150c 100644
--- a/qemu-img-cmds.hx
+++ b/qemu-img-cmds.hx
@@ -34,7 +34,7 @@ STEXI
ETEXI
DEF("convert", img_convert,
- "convert [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-O output_fmt] [-o options] [-s snapshot_name] [-S sparse_size] filename [filename2 [...]] output_filename")
+ "convert [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-O output_fmt] [-o options] [-s snapshot_id_or_name] [-L snapshot_param] [-S sparse_size] filename [filename2 [...]] output_filename")
STEXI
@item convert [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_name}] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}
ETEXI
diff --git a/qemu-img.c b/qemu-img.c
index a784ad4..29eabaf 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -93,6 +93,8 @@ static void help(void)
" 'options' is a comma separated list of format specific options in a\n"
" name=value format. Use -o ? for an overview of the options supported by the\n"
" used format\n"
+ " 'snapshot_param' is param used for internal snapshot, format is\n"
+ " 'snapshot.id=[ID],snapshot.name=[NAME]'\n"
" '-c' indicates that target image must be compressed (qcow format only)\n"
" '-u' enables unsafe rebasing. It is assumed that old and new backing file\n"
" match exactly. The image doesn't need a working backing file before\n"
diff --git a/qemu-img.texi b/qemu-img.texi
index 768054e..c025ba6 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -46,6 +46,9 @@ is the destination disk image filename
is a comma separated list of format specific options in a
name=value format. Use @code{-o ?} for an overview of the options supported
by the used format or see the format descriptions below for details.
+@item snapshot_param
+is param used for internal snapshot, format is
+'snapshot.id=[ID],snapshot.name=[NAME]'
@item -c
@@ -179,9 +182,9 @@ Error on reading data
@end table
-@item convert [-c] [-p] [-n] [-f @var{fmt}] [-t @var{cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_name}] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}
+@item convert [-c] [-p] [-n] [-f @var{fmt}] [-t @var{cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-L @var{snapshot_param}] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}
-Convert the disk image @var{filename} or a snapshot @var{snapshot_name} to disk image @var{output_filename}
+Convert the disk image @var{filename} or a snapshot @var{snapshot_id_or_name} to disk image @var{output_filename}
using format @var{output_fmt}. It can be optionally compressed (@code{-c}
option) or use any format specific options like encryption (@code{-o} option).
--
1.7.1
next prev parent reply other threads:[~2013-09-26 0:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 0:16 [Qemu-devel] [PATCH V3 0/7] export internal snapshot by qemu-nbd Wenchao Xia
2013-09-26 0:16 ` [Qemu-devel] [PATCH V3 1/7] snapshot: distinguish id and name in load_tmp Wenchao Xia
2013-10-01 14:35 ` Eric Blake
2013-10-10 5:38 ` Wenchao Xia
2013-09-26 0:16 ` [Qemu-devel] [PATCH V3 2/7] qemu-nbd: support internal snapshot export Wenchao Xia
2013-10-01 14:45 ` Eric Blake
2013-10-01 16:08 ` Paolo Bonzini
2013-10-10 6:00 ` Wenchao Xia
2013-10-10 6:12 ` Wenchao Xia
2013-09-26 0:16 ` [Qemu-devel] [PATCH V3 3/7] qemu-nbd: add doc for " Wenchao Xia
2013-10-01 14:49 ` Eric Blake
2013-10-10 6:04 ` Wenchao Xia
2013-09-26 0:16 ` [Qemu-devel] [PATCH V3 4/7] qemu-iotests: add 058 internal snapshot export with qemu-nbd case Wenchao Xia
2013-10-01 14:53 ` Eric Blake
2013-10-10 6:06 ` Wenchao Xia
2013-09-26 0:16 ` [Qemu-devel] [PATCH V3 5/7] qemu-img: add -L for snapshot in convert Wenchao Xia
2013-10-01 14:54 ` Eric Blake
2013-10-01 16:07 ` Paolo Bonzini
2013-10-10 6:07 ` Wenchao Xia
2013-09-26 0:16 ` Wenchao Xia [this message]
2013-10-01 14:56 ` [Qemu-devel] [PATCH V3 6/7] qemu-img: add doc for param -L " Eric Blake
2013-10-10 6:09 ` Wenchao Xia
2013-09-26 0:16 ` [Qemu-devel] [PATCH V3 7/7] qemu-iotests: add test for snapshot in qemu-img convert Wenchao Xia
2013-10-01 14:57 ` Eric Blake
2013-10-10 6:10 ` Wenchao Xia
2013-09-30 5:57 ` [Qemu-devel] [PATCH V3 0/7] export internal snapshot by qemu-nbd Wenchao Xia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380154568-5339-7-git-send-email-xiawenc@linux.vnet.ibm.com \
--to=xiawenc@linux.vnet.ibm.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).