See the previous patch for rationale. Done with:
$ find docs -name '*.html.in' | \
xargs sed -i '/</ s/\([a-zA-Z0-9_]*=\)"\([^"]*\)"/\1'\''\2'\''/g'
* cfg.mk (sc_xml_quote_style): Extend the rule.
* docs/*.html.in: Fix fallout.
---
I'm not as worried about the overall html file being a consistent
style as I am the html-ized example texts. The change was intentionally
limited to lines starting with '<', to minimize the size of the
diff, even if it did pick up a few changes that aren't user-visible.
cfg.mk | 4 +
docs/csharp.html.in | 2 +-
docs/drvqemu.html.in | 4 +-
docs/drvvbox.html.in | 12 ++--
docs/drvxen.html.in | 4 +-
docs/formatcaps.html.in | 18 +++---
docs/formatdomain.html.in | 124 +++++++++++++++++-----------------
docs/formatnetwork.html.in | 74 ++++++++++----------
docs/formatstorage.html.in | 22 +++---
docs/formatstorageencryption.html.in | 2 +-
docs/news.html.in | 2 +-
docs/storage.html.in | 34 +++++-----
12 files changed, 153 insertions(+), 149 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 8591f12..c0d638b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -425,6 +425,10 @@ sc_xml_quote_style:
in_vc_files='\.(rng|xml)$$' \
halt='use name='\'val\'', not name="val", in xml' \
$(_sc_search_regexp)
+ @prohibit='<.*\b[-a-zA-Z0-9_]+="' \
+ in_vc_files='\.html\.in$$' \
+ halt='use name='\'val\'', not name="val", in html-ized xml' \
+ $(_sc_search_regexp)
ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\
|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper
diff --git a/docs/csharp.html.in b/docs/csharp.html.in
index 62da6a8..8d664e7 100644
--- a/docs/csharp.html.in
+++ b/docs/csharp.html.in
@@ -121,7 +121,7 @@ git clone git://libvirt.org/libvirt-csharp.git
<p>
The C# bindings are the work of Arnaud Champion
- <<a href="mailto:arnaud.champion AT devatom.fr">arnaud.champion AT devatom.fr</a>>,
+ <<a href='mailto:arnaud.champion AT devatom.fr'>arnaud.champion AT devatom.fr</a>>,
based upon the previous work of Jaromír Červenka.
</p>
diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
index 4da3817..97e1df5 100644
--- a/docs/drvqemu.html.in
+++ b/docs/drvqemu.html.in
@@ -553,9 +553,9 @@ $ virsh domxml-to-native qemu-argv demo.xml
<memory>131072</memory>
<vcpu>1</vcpu>
<os>
- <type arch="i686">hvm</type>
+ <type arch='i686'>hvm</type>
</os>
- <clock sync="localtime"/>
+ <clock sync='localtime'/>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
diff --git a/docs/drvvbox.html.in b/docs/drvvbox.html.in
index db82d2a..4d3b551 100644
--- a/docs/drvvbox.html.in
+++ b/docs/drvvbox.html.in
@@ -100,14 +100,14 @@ vbox+ssh://user@xxxxxxxxxxx/session (remote access, SSH tunnelled)
<target port='1'/>
</parallel>
- <serial type="dev">
- <source path="/dev/ttyS0"/>
- <target port="0"/>
+ <serial type='dev'>
+ <source path='/dev/ttyS0'/>
+ <target port='0'/>
</serial>
- <serial type="pipe">
- <source path="/tmp/serial.txt"/>
- <target port="1"/>
+ <serial type='pipe'>
+ <source path='/tmp/serial.txt'/>
+ <target port='1'/>
</serial>
<hostdev mode='subsystem' type='usb'>
diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in
index 631f7ed..6d6a70a 100644
--- a/docs/drvxen.html.in
+++ b/docs/drvxen.html.in
@@ -247,7 +247,7 @@ vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]
<acpi/>
<apic/>
</features>
- <clock sync="localtime"/>
+ <clock sync='localtime'/>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<interface type='bridge'>
@@ -301,7 +301,7 @@ vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]
<acpi/>
<apic/>
</features>
- <clock sync="localtime"/>
+ <clock sync='localtime'/>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<interface type='bridge'>
diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in
index 9d42426..0538eba 100644
--- a/docs/formatcaps.html.in
+++ b/docs/formatcaps.html.in
@@ -15,7 +15,7 @@ associated to the current connection. For example in the case of a 64 bits
machine with hardware virtualization capabilities enabled in the chip and
BIOS you will see</p>
<pre><capabilities>
- <span style="color: #E50000"><host>
+ <span style='color: #E50000'><host>
<cpu>
<arch>x86_64</arch>
<features>
@@ -23,8 +23,8 @@ BIOS you will see</p>
</features>
<model>core2duo</model>
<vendor>Intel</vendor>
- <topology sockets="1" cores="2" threads="1"/>
- <feature name="lahf_lm"/>
+ <topology sockets='1' cores='2' threads='1'/>
+ <feature name='lahf_lm'/>
<feature name='xtpr'/>
...
</cpu>
@@ -36,11 +36,11 @@ BIOS you will see</p>
</host></span>
<!-- xen-3.0-x86_64 -->
- <span style="color: #0000E5"><guest>
+ <span style='color: #0000E5'><guest>
<os_type>xen</os_type>
- <arch name="x86_64">
+ <arch name='x86_64'>
<wordsize>64</wordsize>
- <domain type="xen"></domain>
+ <domain type='xen'></domain>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
</arch>
<features>
@@ -48,11 +48,11 @@ BIOS you will see</p>
</guest></span>
<!-- hvm-3.0-x86_32 -->
- <span style="color: #00B200"><guest>
+ <span style='color: #00B200'><guest>
<os_type>hvm</os_type>
- <arch name="i686">
+ <arch name='i686'>
<wordsize>32</wordsize>
- <domain type="xen"></domain>
+ <domain type='xen'></domain>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<machine>pc</machine>
<machine>isapc</machine>
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 204373e..2141de4 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -287,7 +287,7 @@
<pre>
<domain>
...
- <vcpu cpuset="1-4,^3,6" current="1">2</vcpu>
+ <vcpu cpuset='1-4,^3,6' current='1'>2</vcpu>
...
</domain>
</pre>
@@ -316,10 +316,10 @@
<domain>
...
<cputune>
- <vcpupin vcpu="0" cpuset="1-4,^2"/>
- <vcpupin vcpu="1" cpuset="0,1"/>
- <vcpupin vcpu="2" cpuset="2,3"/>
- <vcpupin vcpu="3" cpuset="0,4"/>
+ <vcpupin vcpu='0' cpuset='1-4,^2'/>
+ <vcpupin vcpu='1' cpuset='0,1'/>
+ <vcpupin vcpu='2' cpuset='2,3'/>
+ <vcpupin vcpu='3' cpuset='0,4'/>
<shares>2048</shares>
<period>1000000</period>
<quota>-1</quota>
@@ -473,7 +473,7 @@
<domain>
...
<numatune>
- <memory mode="strict" nodeset="1-4,^3"/>
+ <memory mode='strict' nodeset='1-4,^3'/>
</numatune>
...
</domain>
@@ -537,7 +537,7 @@
the same host file system, which is why this tuning parameter
is at the global domain level rather than associated with each
guest disk device (contrast this to
- the <a href="#elementsDisks"><code><iotune></code></a>
+ the <a href='#elementsDisks'><code><iotune></code></a>
element which can apply to an
individual <code><disk></code>).
Each <code>device</code> element has two
@@ -798,11 +798,11 @@
<pre>
...
- <clock offset="localtime">
- <timer name="rtc" tickpolicy="catchup" track="guest">
+ <clock offset='localtime'>
+ <timer name='rtc' tickpolicy='catchup' track='guest'>
<catchup threshold=123 slew=120 limit=10000/>
</timer>
- <timer name="pit" tickpolicy="delay"/>
+ <timer name='pit' tickpolicy='delay'/>
</clock>
...</pre>
@@ -946,7 +946,7 @@
...
<devices>
<disk type='file' snapshot='external'>
- <driver name="tap" type="aio" cache="default"/>
+ <driver name='tap' type='aio' cache='default'/>
<source file='/var/lib/xen/images/fv0'/ startupPolicy='optional'>
<target dev='hda' bus='ide'/>
<iotune>
@@ -965,21 +965,21 @@
</disk>
...
<disk type='network'>
- <driver name="qemu" type="raw" io="threads" ioeventfd="on" event_idx="off"/>
- <source protocol="sheepdog" name="image_name">
- <host name="hostname" port="7000"/>
+ <driver name='qemu' type='raw' io='threads' ioeventfd='on' event_idx='off'/>
+ <source protocol='sheepdog' name='image_name'>
+ <host name='hostname' port='7000'/>
</source>
- <target dev="hdb" bus="ide"/>
+ <target dev='hdb' bus='ide'/>
<boot order='1'/>
<transient/>
<address type='drive' controller='0' bus='1' unit='0'/>
</disk>
<disk type='network'>
- <driver name="qemu" type="raw"/>
- <source protocol="rbd" name="image_name2">
- <host name="hostname" port="7000"/>
+ <driver name='qemu' type='raw'/>
+ <source protocol='rbd' name='image_name2'>
+ <host name='hostname' port='7000'/>
</source>
- <target dev="hdd" bus="ide"/>
+ <target dev='hdd' bus='ide'/>
<auth username='myuser'>
<secret type='ceph' usage='mypassid'/>
</auth>
@@ -1075,7 +1075,7 @@
<dd>The optional <code>iotune</code> element provides the
ability to provide additional per-device I/O tuning, with
values that can vary for each device (contrast this to
- the <a href="#elementsBlockTuning"><code><blkiotune></code></a>
+ the <a href='#elementsBlockTuning'><code><blkiotune></code></a>
element, which applies globally to the domain). Currently,
the only tuning available is Block I/O throttling for qemu.
This element has optional sub-elements; any sub-element not
@@ -1854,7 +1854,7 @@
<interface type='network'>
<source network='default' portgroup='engineering'/>
<target dev='vnet7'/>
- <mac address="00:11:22:33:44:55"/>
+ <mac address='00:11:22:33:44:55'/>
<virtualport type='802.1Qbg'>
<parameters managerid='11' typeid='1193047' typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
</virtualport>
@@ -1894,7 +1894,7 @@
<interface type='bridge'>
<source bridge='br0'/>
<target dev='vnet7'/>
- <mac address="00:11:22:33:44:55"/>
+ <mac address='00:11:22:33:44:55'/>
</interface>
</devices>
...</pre>
@@ -1916,7 +1916,7 @@
<interface type='user'/>
...
<interface type='user'>
- <mac address="00:11:22:33:44:55"/>
+ <mac address='00:11:22:33:44:55'/>
</interface>
</devices>
...</pre>
@@ -2045,8 +2045,8 @@
...
<interface type='direct'>
<source dev='eth0.2' mode='vepa'/>
- <virtualport type="802.1Qbg">
- <parameters managerid="11" typeid="1193047" typeidversion="2" instanceid="09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f"/>
+ <virtualport type='802.1Qbg'>
+ <parameters managerid='11' typeid='1193047' typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
</virtualport>
</interface>
</devices>
@@ -2925,9 +2925,9 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="file">
- <source path="/var/log/vm/vm-serial.log"/>
- <target port="1"/>
+ <serial type='file'>
+ <source path='/var/log/vm/vm-serial.log'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -2944,7 +2944,7 @@ qemu-kvm -net nic,model=? /dev/null
...
<devices>
<serial type='vc'>
- <target port="1"/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -2960,7 +2960,7 @@ qemu-kvm -net nic,model=? /dev/null
...
<devices>
<serial type='null'>
- <target port="1"/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -2976,9 +2976,9 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="pty">
- <source path="/dev/pts/3"/>
- <target port="1"/>
+ <serial type='pty'>
+ <source path='/dev/pts/3'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -3003,9 +3003,9 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="dev">
- <source path="/dev/ttyS0"/>
- <target port="1"/>
+ <serial type='dev'>
+ <source path='/dev/ttyS0'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -3020,9 +3020,9 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="pipe">
- <source path="/tmp/mypipe"/>
- <target port="1"/>
+ <serial type='pipe'>
+ <source path='/tmp/mypipe'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -3037,10 +3037,10 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="tcp">
- <source mode="connect" host="0.0.0.0" service="2445"/>
- <protocol type="raw"/>
- <target port="1"/>
+ <serial type='tcp'>
+ <source mode='connect' host='0.0.0.0' service='2445'/>
+ <protocol type='raw'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -3052,10 +3052,10 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="tcp">
- <source mode="bind" host="127.0.0.1" service="2445"/>
- <protocol type="raw"/>
- <target port="1"/>
+ <serial type='tcp'>
+ <source mode='bind' host='127.0.0.1' service='2445'/>
+ <protocol type='raw'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -3070,16 +3070,16 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="tcp">
- <source mode="connect" host="0.0.0.0" service="2445"/>
- <protocol type="telnet"/>
- <target port="1"/>
+ <serial type='tcp'>
+ <source mode='connect' host='0.0.0.0' service='2445'/>
+ <protocol type='telnet'/>
+ <target port='1'/>
</serial>
...
- <serial type="tcp">
- <source mode="bind" host="127.0.0.1" service="2445"/>
- <protocol type="telnet"/>
- <target port="1"/>
+ <serial type='tcp'>
+ <source mode='bind' host='127.0.0.1' service='2445'/>
+ <protocol type='telnet'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -3094,10 +3094,10 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="udp">
- <source mode="bind" host="0.0.0.0" service="2445"/>
- <source mode="connect" host="0.0.0.0" service="2445"/>
- <target port="1"/>
+ <serial type='udp'>
+ <source mode='bind' host='0.0.0.0' service='2445'/>
+ <source mode='connect' host='0.0.0.0' service='2445'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
@@ -3112,9 +3112,9 @@ qemu-kvm -net nic,model=? /dev/null
<pre>
...
<devices>
- <serial type="unix">
- <source mode="bind" path="/tmp/foo"/>
- <target port="1"/>
+ <serial type='unix'>
+ <source mode='bind' path='/tmp/foo'/>
+ <target port='1'/>
</serial>
</devices>
...</pre>
diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index 02302fa..8ec3c29 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -57,9 +57,9 @@
<pre>
...
- <bridge name="virbr0" stp="on" delay="5"/>
- <domain name="example.com"/>
- <forward mode="nat" dev="eth0"/>
+ <bridge name='virbr0' stp='on' delay='5'/>
+ <domain name='example.com'/>
+ <forward mode='nat' dev='eth0'/>
...</pre>
<dl>
@@ -274,11 +274,11 @@
<pre>
...
<forward mode='private'/>
- <interface dev="eth20"/>
- <interface dev="eth21"/>
- <interface dev="eth22"/>
- <interface dev="eth23"/>
- <interface dev="eth24"/>
+ <interface dev='eth20'/>
+ <interface dev='eth21'/>
+ <interface dev='eth22'/>
+ <interface dev='eth23'/>
+ <interface dev='eth24'/>
</forward>
<b><portgroup name='engineering' default='yes'>
<virtualport type='802.1Qbh'>
@@ -342,21 +342,21 @@
<pre>
...
<mac address='00:16:3E:5D:C7:9E'/>
- <domain name="example.com"/>
+ <domain name='example.com'/>
<dns>
- <txt name="example" value="example value" />
+ <txt name='example' value='example value' />
<host ip='192.168.122.2'>
<hostname>myhost</hostname>
<hostname>myhostalias</hostname>
</dns>
- <ip address="192.168.122.1" netmask="255.255.255.0">
+ <ip address='192.168.122.1' netmask='255.255.255.0'>
<dhcp>
- <range start="192.168.122.100" end="192.168.122.254" />
- <host mac="00:16:3e:77:e2:ed" name="foo.example.com" ip="192.168.122.10" />
- <host mac="00:16:3e:3e:a9:1a" name="bar.example.com" ip="192.168.122.11" />
+ <range start='192.168.122.100' end='192.168.122.254' />
+ <host mac='00:16:3e:77:e2:ed' name='foo.example.com' ip='192.168.122.10' />
+ <host mac='00:16:3e:3e:a9:1a' name='bar.example.com' ip='192.168.122.11' />
</dhcp>
</ip>
- <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
+ <ip family='ipv6' address='2001:db8:ca2:2::1' prefix='64' />
</network></pre>
<dl>
@@ -489,14 +489,14 @@
<pre>
<network>
<name>default</name>
- <bridge name="virbr0" />
- <forward mode="nat"/>
- <ip address="192.168.122.1" netmask="255.255.255.0">
+ <bridge name='virbr0' />
+ <forward mode='nat'/>
+ <ip address='192.168.122.1' netmask='255.255.255.0'>
<dhcp>
- <range start="192.168.122.2" end="192.168.122.254" />
+ <range start='192.168.122.2' end='192.168.122.254' />
</dhcp>
</ip>
- <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
+ <ip family='ipv6' address='2001:db8:ca2:2::1' prefix='64' />
</network></pre>
<h3><a name="examplesRoute">Routed network config</a></h3>
@@ -513,14 +513,14 @@
<pre>
<network>
<name>local</name>
- <bridge name="virbr1" />
- <forward mode="route" dev="eth1"/>
- <ip address="192.168.122.1" netmask="255.255.255.0">
+ <bridge name='virbr1' />
+ <forward mode='route' dev='eth1'/>
+ <ip address='192.168.122.1' netmask='255.255.255.0'>
<dhcp>
- <range start="192.168.122.2" end="192.168.122.254" />
+ <range start='192.168.122.2' end='192.168.122.254' />
</dhcp>
</ip>
- <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
+ <ip family='ipv6' address='2001:db8:ca2:2::1' prefix='64' />
</network></pre>
<h3><a name="examplesPrivate">Isolated network config</a></h3>
@@ -536,13 +536,13 @@
<pre>
<network>
<name>private</name>
- <bridge name="virbr2" />
- <ip address="192.168.152.1" netmask="255.255.255.0">
+ <bridge name='virbr2' />
+ <ip address='192.168.152.1' netmask='255.255.255.0'>
<dhcp>
- <range start="192.168.152.2" end="192.168.152.254" />
+ <range start='192.168.152.2' end='192.168.152.254' />
</dhcp>
</ip>
- <ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" />
+ <ip family='ipv6' address='2001:db8:ca2:3::1' prefix='64' />
</network></pre>
<h3><a name="examplesBridge">Using an existing host bridge</a></h3>
@@ -559,8 +559,8 @@
<pre>
<network>
<name>host-bridge</name>
- <forward mode="bridge"/>
- <bridge name="br0"/>
+ <forward mode='bridge'/>
+ <bridge name='br0'/>
</network></pre>
<h3><a name="examplesDirect">Using a macvtap "direct" connection</a></h3>
@@ -589,12 +589,12 @@
<pre>
<network>
<name>direct-macvtap</name>
- <forward mode="bridge">
- <interface dev="eth20"/>
- <interface dev="eth21"/>
- <interface dev="eth22"/>
- <interface dev="eth23"/>
- <interface dev="eth24"/>
+ <forward mode='bridge'>
+ <interface dev='eth20'/>
+ <interface dev='eth21'/>
+ <interface dev='eth22'/>
+ <interface dev='eth23'/>
+ <interface dev='eth24'/>
</forward>
</network></pre>
diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index f13ca6a..88f30cc 100644
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -23,7 +23,7 @@
<h3><a name="StoragePoolFirst">General metadata</a></h3>
<pre>
- <pool type="iscsi">
+ <pool type='iscsi'>
<name>virtimages</name>
<uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>
<allocation>10000000</allocation>
@@ -68,10 +68,10 @@
<pre>
...
<source>
- <host name="iscsi.example.com"/>
- <device path="demo-target"/>
- <vendor name="Acme"/>
- <product name="model"/>
+ <host name='iscsi.example.com'/>
+ <device path='demo-target'/>
+ <vendor name='Acme'/>
+ <product name='model'/>
</source>
...</pre>
@@ -212,7 +212,7 @@
<name>sparse.img</name>
<key>/var/lib/xen/images/sparse.img</key>
<allocation>0</allocation>
- <capacity unit="T">1</capacity>
+ <capacity unit='T'>1</capacity>
...</pre>
<dl>
@@ -363,7 +363,7 @@
<h3><a name="exampleFile">File based storage pool</a></h3>
<pre>
- <pool type="dir">
+ <pool type='dir'>
<name>virtimages</name>
<target>
<path>/var/lib/virt/images</path>
@@ -373,11 +373,11 @@
<h3><a name="exampleISCSI">iSCSI based storage pool</a></h3>
<pre>
- <pool type="iscsi">
+ <pool type='iscsi'>
<name>virtimages</name>
<source>
- <host name="iscsi.example.com"/>
- <device path="demo-target"/>
+ <host name='iscsi.example.com'/>
+ <device path='demo-target'/>
</source>
<target>
<path>/dev/disk/by-path</path>
@@ -390,7 +390,7 @@
<volume>
<name>sparse.img</name>
<allocation>0</allocation>
- <capacity unit="T">1</capacity>
+ <capacity unit='T'>1</capacity>
<target>
<path>/var/lib/virt/images/sparse.img</path>
<permissions>
diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in
index 9557a22..9a96763 100644
--- a/docs/formatstorageencryption.html.in
+++ b/docs/formatstorageencryption.html.in
@@ -33,7 +33,7 @@
</p>
<h3><a name="StorageEncryptionDefault">"default" format</a></h3>
<p>
- <code><encryption type="default"/></code> can be specified only
+ <code><encryption type='default'/></code> can be specified only
when creating a volume. If the volume is successfully created, the
encryption formats, parameters and secrets will be auto-generated by
libvirt and the attached <code>encryption</code> tag will be updated.
diff --git a/docs/news.html.in b/docs/news.html.in
index bf97e95..9af5041 100644
--- a/docs/news.html.in
+++ b/docs/news.html.in
@@ -3920,7 +3920,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log";>GIT log</a>
Make checks for inactive QEMU guest more robust (Daniel P. Berrange),<br/>
Improve some error messages about unsupported APIs/URIs (Daniel P. Berrange),<br/>
Index hashes by UUID instead of name (Jiri Denemark),<br/>
- Allow one-or-more <boot dev="..."/> entries (Philipp Hahn),<br/>
+ Allow one-or-more <boot dev='...'/> entries (Philipp Hahn),<br/>
virsh: add --uuid option to vol-pool (Justin Clift),<br/>
nwfilter: add XML attribute to control iptables state match (Stefan Berger),<br/>
virsh: ensure persistence and autostart are shown for dominfo and pool-info (Justin Clift),<br/>
diff --git a/docs/storage.html.in b/docs/storage.html.in
index a9c7f1c..1890c82 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -46,7 +46,7 @@ libvirt.
<h3>Example pool input definition</h3>
<pre>
- <pool type="dir">
+ <pool type='dir'>
<name>virtimages</name>
<target>
<path>/var/lib/virt/images</path>
@@ -98,10 +98,10 @@ libvirt.
<h3>Example pool input</h3>
<pre>
- <pool type="fs">
+ <pool type='fs'>
<name>virtimages</name>
<source>
- <device path="/dev/VolGroup00/VirtImages"/>
+ <device path='/dev/VolGroup00/VirtImages'/>
</source>
<target>
<path>/var/lib/virt/images</path>
@@ -167,11 +167,11 @@ libvirt.
<h3>Example pool input</h3>
<pre>
- <pool type="netfs">
+ <pool type='netfs'>
<name>virtimages</name>
<source>
- <host name="nfs.example.com"/>
- <dir path="/var/lib/virt/images"/>
+ <host name='nfs.example.com'/>
+ <dir path='/var/lib/virt/images'/>
</source>
<target>
<path>/var/lib/virt/images</path>
@@ -208,12 +208,12 @@ libvirt.
<h3>Example pool input</h3>
<pre>
- <pool type="logical">
+ <pool type='logical'>
<name>HostVG</name>
<source>
- <device path="/dev/sda1"/>
- <device path="/dev/sdb1"/>
- <device path="/dev/sdc1"/>
+ <device path='/dev/sda1'/>
+ <device path='/dev/sdb1'/>
+ <device path='/dev/sdc1'/>
</source>
<target>
<path>/dev/HostVG</path>
@@ -242,7 +242,7 @@ libvirt.
<h3>Example pool input</h3>
<pre>
- <pool type="disk">
+ <pool type='disk'>
<name>sda</name>
<source>
<device path='/dev/sda'/>
@@ -330,11 +330,11 @@ libvirt.
<h3>Example pool input</h3>
<pre>
- <pool type="iscsi">
+ <pool type='iscsi'>
<name>virtimages</name>
<source>
- <host name="iscsi.example.com"/>
- <device path="demo-target"/>
+ <host name='iscsi.example.com'/>
+ <device path='demo-target'/>
</source>
<target>
<path>/dev/disk/by-path</path>
@@ -363,10 +363,10 @@ libvirt.
<h3>Example pool input</h3>
<pre>
- <pool type="scsi">
+ <pool type='scsi'>
<name>virtimages</name>
<source>
- <adapter name="host0"/>
+ <adapter name='host0'/>
</source>
<target>
<path>/dev/disk/by-path</path>
@@ -398,7 +398,7 @@ libvirt.
<h3>Example pool input</h3>
<pre>
- <pool type="mpath">
+ <pool type='mpath'>
<name>virtimages</name>
<target>
<path>/dev/mapper</path>
--
1.7.7.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list