From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu2IS-0004kT-MU for qemu-devel@nongnu.org; Fri, 20 Dec 2013 10:47:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vu2IN-0000ZM-Qb for qemu-devel@nongnu.org; Fri, 20 Dec 2013 10:47:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu2IN-0000XX-IU for qemu-devel@nongnu.org; Fri, 20 Dec 2013 10:47:23 -0500 From: Stefan Hajnoczi Date: Fri, 20 Dec 2013 16:46:47 +0100 Message-Id: <1387554416-5837-10-git-send-email-stefanha@redhat.com> In-Reply-To: <1387554416-5837-1-git-send-email-stefanha@redhat.com> References: <1387554416-5837-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 09/18] docs: updated qemu-img man page and qemu-doc to reflect VHDX support. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori From: 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. [Stefan Weil suggested s/Block Size/Block size/ for consistency. I have made this change. --Stefan] Signed-off-by: Jeff Cody Reviewed-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- 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..4e9c6e9 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. -- 1.8.4.2