diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 8c1724a3d0ef69b6e6f5c2d3067138207ec3df48..7fc0cfffcb0bd0c631078cc724f532074b17a33e 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1196,119 +1196,118 @@
-
-
-
- file
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ file
+
-
-
-
-
-
- block
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ block
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ dir
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- dir
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- network
-
-
-
-
-
-
-
-
-
-
-
-
- volume
-
-
-
-
-
-
-
-
-
-
-
-
-
- host
- direct
-
+
+
+
+
+
+
+
+
+
+
+ network
+
+
+
+
+
+
+
+
+
+
+
+ volume
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ host
+ direct
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml
index f01312f5339215c622abc36d360bf9ae93dde4bb..b15fd63e9e419250433661518fee837197d2e859 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml
@@ -16,11 +16,13 @@
restart
/usr/bin/qemu
-
-
+
+
+
-
+
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml
index e96f76eae847da92cb70213c16e05fec3e4ff0ab..95d5be29045611d3db7e57dbc03645f63928685c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml
@@ -14,15 +14,17 @@
destroy
/usr/bin/qemu
-
-