Patchwork [qemu-kvm,v2] docs: updated qemu-img man page and qemu-doc to reflect VHDX support.

login
register
mail settings
Submitter Jeff Cody
Date Dec. 17, 2013, 6:56 p.m.
Message ID <3c36242e55b6cb881ce8db1d67283a8358d96f17.1387306432.git.jcody@redhat.com>
Download mbox | patch
Permalink /patch/302424/
State New
Headers show

Comments

Jeff Cody - Dec. 17, 2013, 6:56 p.m.
The man page for qemu-img, and the qemu-doc, did not mention VHDX
as a supported format.  This adds in reference to VHDX in those
documents.

Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 qemu-doc.texi | 15 +++++++++++++++
 qemu-img.texi |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
Stefan Weil - Dec. 17, 2013, 10:14 p.m.
Am 17.12.2013 19:56, schrieb Jeff Cody:
> The man page for qemu-img, and the qemu-doc, did not mention VHDX
> as a supported format.  This adds in reference to VHDX in those
> documents.
>
> Signed-off-by: Jeff Cody <jcody@redhat.com>
> ---
>  qemu-doc.texi | 15 +++++++++++++++
>  qemu-img.texi |  4 ++--
>  2 files changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index 185dd47..f9f11ae 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -654,6 +654,21 @@ Supported options:
>  Specifies which VHD subformat to use. Valid options are
>  @code{dynamic} (default) and @code{fixed}.
>  @end table
> +
> +@item VHDX
> +Hyper-V compatible image format (VHDX).
> +Supported options:
> +@table @code
> +@item subformat
> +Specifies which VHDX subformat to use. Valid options are
> +@code{dynamic} (default) and @code{fixed}.
> +@item block_state_zero
> +Force use of payload blocks of type 'ZERO'.
> +@item block_size
> +Block Size; min 1 MB, max 256 MB.  0 means auto-calculate based on image size.

s/Size/size/ (can be fixed by Kevin or Stefan, no need for a v3 patch)

> +@item log_size
> +Log size; min 1 MB.
> +@end table
>  @end table
>  
>  @subsubsection Read-only formats
> diff --git a/qemu-img.texi b/qemu-img.texi
> index be31191..1bba91e 100644
> --- a/qemu-img.texi
> +++ b/qemu-img.texi
> @@ -431,8 +431,8 @@ This option can only be enabled if @code{compat=1.1} is specified.
>  
>  @item Other
>  QEMU also supports various other image file formats for compatibility with
> -older QEMU versions or other hypervisors, including VMDK, VDI, VHD (vpc), qcow1
> -and QED. For a full list of supported formats see @code{qemu-img --help}.
> +older QEMU versions or other hypervisors, including VMDK, VDI, VHD (vpc), VHDX,
> +qcow1 and QED. For a full list of supported formats see @code{qemu-img --help}.
>  For a more detailed description of these formats, see the QEMU Emulation User
>  Documentation.

Reviewed-by: Stefan Weil <sw@weilnetz.de>

Patch

diff --git a/qemu-doc.texi b/qemu-doc.texi
index 185dd47..f9f11ae 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -654,6 +654,21 @@  Supported options:
 Specifies which VHD subformat to use. Valid options are
 @code{dynamic} (default) and @code{fixed}.
 @end table
+
+@item VHDX
+Hyper-V compatible image format (VHDX).
+Supported options:
+@table @code
+@item subformat
+Specifies which VHDX subformat to use. Valid options are
+@code{dynamic} (default) and @code{fixed}.
+@item block_state_zero
+Force use of payload blocks of type 'ZERO'.
+@item block_size
+Block Size; min 1 MB, max 256 MB.  0 means auto-calculate based on image size.
+@item log_size
+Log size; min 1 MB.
+@end table
 @end table
 
 @subsubsection Read-only formats
diff --git a/qemu-img.texi b/qemu-img.texi
index be31191..1bba91e 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -431,8 +431,8 @@  This option can only be enabled if @code{compat=1.1} is specified.
 
 @item Other
 QEMU also supports various other image file formats for compatibility with
-older QEMU versions or other hypervisors, including VMDK, VDI, VHD (vpc), qcow1
-and QED. For a full list of supported formats see @code{qemu-img --help}.
+older QEMU versions or other hypervisors, including VMDK, VDI, VHD (vpc), VHDX,
+qcow1 and QED. For a full list of supported formats see @code{qemu-img --help}.
 For a more detailed description of these formats, see the QEMU Emulation User
 Documentation.