[PATCH 4/5] docs: Add NVMe and NVMe namespace disk bus types to documentation
From: ray <honglei.wang(a)smartx.com>
Update documentation to include nvme and nvme-ns disk bus types:
- Add "nvme" and "nvme-ns" to the list of supported disk bus types
- Extend the allowed disk target device patterns to include nvme and nvmens prefixes
Signed-off-by: ray <honglei.wang(a)smartx.com>
---
docs/formatdomain.rst | 5 +++--
src/conf/schemas/domaincommon.rng | 12 +++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 381bf84f67..92d3c58503 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -3248,7 +3248,8 @@ paravirtualized driver is specified via the ``disk`` element.
name in the guest OS. Treat it as a device ordering hint. The optional
``bus`` attribute specifies the type of disk device to emulate; possible
values are driver specific, with typical values being "ide",
"scsi",
- "virtio", "xen", "usb", "sata", or
"sd" :since:`"sd" since 1.1.2`. If
+ "virtio", "xen", "usb", "sata", "sd"
:since:`"sd" since 1.1.2`, "nvme" or
+ "nvme-ns":since:`"nvme" and "nvme-ns" since 11.1.0`. If
omitted, the bus type is inferred from the style of the device name (e.g. a
device named 'sda' will typically be exported using a SCSI bus). The optional
attribute ``tray`` indicates the tray status of the removable disks (i.e.
@@ -4047,7 +4048,7 @@ device hotplug is expected.
...
Each controller has a mandatory attribute ``type``, which must be one of 'ide',
-'fdc', 'scsi', 'sata', 'usb', 'ccid',
'virtio-serial' or 'pci', and a mandatory
+'fdc', 'scsi', 'sata', 'usb', 'ccid',
'virtio-serial', 'pci' or "nvme", and a mandatory
attribute ``index`` which is the decimal integer describing in which order the
bus controller is encountered (for use in ``controller`` attributes of
``<address>`` elements). :since:`Since 1.3.5` the index is optional; if not
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 3328a63205..afa98d5266 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -2520,7 +2520,7 @@
<define name="diskTargetDev">
<data type="string">
- <param
name="pattern">(ioemu:)?(fd|hd|sd|vd|xvd|ubd)[a-zA-Z0-9_]+</param>
+ <param
name="pattern">(ioemu:)?(fd|hd|sd|vd|xvd|ubd|nvmens|nvme)[a-zA-Z0-9_]+</param>
</data>
</define>
@@ -2541,6 +2541,8 @@
<value>uml</value> <!-- NOT USED ANYMORE -->
<value>sata</value>
<value>sd</value>
+ <value>nvme</value>
+ <value>nvme-ns</value>
</choice>
</attribute>
</optional>
@@ -3046,6 +3048,14 @@
</attribute>
</optional>
</group>
+ <group>
+ <attribute name="type">
+ <value>nvme</value>
+ </attribute>
+ <element name="serial">
+ <ref name="diskSerial"/>
+ </element>
+ </group>
</choice>
<optional>
<element name="driver">
--
2.11.0