|
 |
9ae3a8 |
From af46a6d4f31243a842661383dc02548a1b1a3387 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 13 Jan 2014 20:53:20 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 13/16] docs: updated qemu-img man page and qemu-doc to reflect VHDX support.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
Message-id: <8e219e849b375a123cef62478edc843bb4439841.1389633864.git.jcody@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56644
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH] docs: updated qemu-img man page and qemu-doc to reflect VHDX support.
|
|
|
9ae3a8 |
Bugzilla: 1017650
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The man page for qemu-img, and the qemu-doc, did not mention VHDX
|
|
|
9ae3a8 |
as a supported format. This adds in reference to VHDX in those
|
|
|
9ae3a8 |
documents.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
[Stefan Weil <sw@weilnetz.de> suggested s/Block Size/Block size/ for
|
|
|
9ae3a8 |
consistency. I have made this change.
|
|
|
9ae3a8 |
--Stefan]
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Stefan Weil <sw@weilnetz.de>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 8282db1b2e7394574cb55fcc608c5cb0df159d8f)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
BZ 1017650
|
|
|
9ae3a8 |
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6861830
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-doc.texi | 15 +++++++++++++++
|
|
|
9ae3a8 |
qemu-img.texi | 4 ++--
|
|
|
9ae3a8 |
2 files changed, 17 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-doc.texi | 15 +++++++++++++++
|
|
|
9ae3a8 |
qemu-img.texi | 4 ++--
|
|
|
9ae3a8 |
2 files changed, 17 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qemu-doc.texi b/qemu-doc.texi
|
|
|
9ae3a8 |
index 5fc0eae..319c2f2 100644
|
|
|
9ae3a8 |
--- a/qemu-doc.texi
|
|
|
9ae3a8 |
+++ b/qemu-doc.texi
|
|
|
9ae3a8 |
@@ -654,6 +654,21 @@ Supported options:
|
|
|
9ae3a8 |
Specifies which VHD subformat to use. Valid options are
|
|
|
9ae3a8 |
@code{dynamic} (default) and @code{fixed}.
|
|
|
9ae3a8 |
@end table
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+@item VHDX
|
|
|
9ae3a8 |
+Hyper-V compatible image format (VHDX).
|
|
|
9ae3a8 |
+Supported options:
|
|
|
9ae3a8 |
+@table @code
|
|
|
9ae3a8 |
+@item subformat
|
|
|
9ae3a8 |
+Specifies which VHDX subformat to use. Valid options are
|
|
|
9ae3a8 |
+@code{dynamic} (default) and @code{fixed}.
|
|
|
9ae3a8 |
+@item block_state_zero
|
|
|
9ae3a8 |
+Force use of payload blocks of type 'ZERO'.
|
|
|
9ae3a8 |
+@item block_size
|
|
|
9ae3a8 |
+Block size; min 1 MB, max 256 MB. 0 means auto-calculate based on image size.
|
|
|
9ae3a8 |
+@item log_size
|
|
|
9ae3a8 |
+Log size; min 1 MB.
|
|
|
9ae3a8 |
+@end table
|
|
|
9ae3a8 |
@end table
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@subsubsection Read-only formats
|
|
|
9ae3a8 |
diff --git a/qemu-img.texi b/qemu-img.texi
|
|
|
9ae3a8 |
index da36975..a71f132 100644
|
|
|
9ae3a8 |
--- a/qemu-img.texi
|
|
|
9ae3a8 |
+++ b/qemu-img.texi
|
|
|
9ae3a8 |
@@ -427,8 +427,8 @@ This option can only be enabled if @code{compat=1.1} is specified.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@item Other
|
|
|
9ae3a8 |
QEMU also supports various other image file formats for compatibility with
|
|
|
9ae3a8 |
-older QEMU versions or other hypervisors, including VMDK, VDI, VHD (vpc), qcow1
|
|
|
9ae3a8 |
-and QED. For a full list of supported formats see @code{qemu-img --help}.
|
|
|
9ae3a8 |
+older QEMU versions or other hypervisors, including VMDK, VDI, VHD (vpc), VHDX,
|
|
|
9ae3a8 |
+qcow1 and QED. For a full list of supported formats see @code{qemu-img --help}.
|
|
|
9ae3a8 |
For a more detailed description of these formats, see the QEMU Emulation User
|
|
|
9ae3a8 |
Documentation.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|