libvirt/SOURCES/libvirt-docs-Document-the-n...

101 lines
3.4 KiB
Diff

From 0f126297ca984aa2ef145e2a703fff3dc31c53db Mon Sep 17 00:00:00 2001
Message-Id: <0f126297ca984aa2ef145e2a703fff3dc31c53db@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 19 Feb 2020 15:10:19 +0100
Subject: [PATCH] docs: Document the new <slices> sub-element of disk's
<source>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We are going to add support for specifying offset and size attributes
which will allow controling where the image and where the guest data
itself starts in the source of the disk. This will be represented by
a <slices> element filled with either a <slice type='storage'> for the
offset of the image format data.
Add the XML documentation and RNG schema.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit 44f0f76890c6b53a893ffc370836794d74317c34)
https://bugzilla.redhat.com/show_bug.cgi?id=1791788
Message-Id: <9f5488f2e0e5b6d7df386fa428f7779346cbcff4.1582120424.git.pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
docs/formatdomain.html.in | 13 +++++++++++++
docs/schemas/domaincommon.rng | 19 +++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index ec48ed77a5..5dbb8b59cf 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2878,6 +2878,9 @@
&lt;disk type='block' device='lun'&gt;
&lt;driver name='qemu' type='raw'/&gt;
&lt;source dev='/dev/sda'&gt;
+ &lt;slices&gt;
+ &lt;slice type='storage' offset='12345' size='123'/&gt;
+ &lt;/slices&gt;
&lt;reservations managed='no'&gt;
&lt;source type='unix' path='/path/to/qemu-pr-helper' mode='client'/&gt;
&lt;/reservations&gt;
@@ -3360,6 +3363,16 @@
controller.
<span class="since">Since 6.0.0</span>
</dd>
+ <dt><code>slices</code></dt>
+ <dd>The <code>slices</code> element using its <code>slice</code>
+ sub-elements allows configuring offset and size of either the
+ location of the image format (<code>slice type='storage'</code>)
+ inside the storage source or the guest data inside the image format
+ container (future expansion).
+
+ The <code>offset</code> and <code>size</code> values are in bytes.
+ <span class="since">Since 6.1.0</span>
+ </dd>
</dl>
<p>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 19476a2735..38aef19e89 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1596,12 +1596,31 @@
</optional>
</define>
+ <define name="diskSourceSlice">
+ <attribute name='offset'>
+ <ref name="positiveInteger"/>
+ </attribute>
+ <attribute name='size'>
+ <ref name="positiveInteger"/>
+ </attribute>
+ </define>
+
<define name="diskSourceCommon">
<optional>
<attribute name="index">
<ref name="positiveInteger"/>
</attribute>
</optional>
+ <optional>
+ <element name='slices'>
+ <element name='slice'>
+ <attribute name='type'>
+ <value>storage</value>
+ </attribute>
+ <ref name="diskSourceSlice"/>
+ </element>
+ </element>
+ </optional>
</define>
<define name="diskSource">
--
2.25.0