[libvirt] [PATCH 00/24] docs: Kill useless spaces in <pre/>
Whilst reviewing patches that reworked our web page I've noticed couple of overflows in some example XMLs. For instance: http://libvirt.org/formatnetwork.html#elementsAddress The problem is we have very long lines sometimes. And to make it worse we have a lot of spaces at the beginning of some <pre/> sections. Remove them. Michal Privoznik (24): aclpolkit.html.in: Kill useless spaces in <pre/> cgroups.html.in: Kill useless spaces in <pre/> compiling.html.in: Kill useless spaces in <pre/> devguide.html.in: Kill useless spaces in <pre/> downloads.html.in: Kill useless spaces in <pre/> drvbhyve.html.in: Kill useless spaces in <pre/> drvesx.html.in: Kill useless spaces in <pre/> drvlxc.html.in: Kill useless spaces in <pre/> format.html.in: Kill useless spaces in <pre/> formatcaps.html.in: Kill useless spaces in <pre/> formatdomain.html.in: Kill useless spaces in <pre/> formatnetwork.html.in: Kill useless spaces in <pre/> formatnwfilter.html.in: Kill useless spaces in <pre/> formatsecret.html.in: Kill useless spaces in <pre/> formatstorage.html.in: Kill useless spaces in <pre/> formatstorageencryption.html.in: Kill useless spaces in <pre/> command.html.in: Kill useless spaces in <pre/> locking.html.in: Kill useless spaces in <pre/> rpc.html.in: Kill useless spaces in <pre/> locking-lockd.html.in: Kill useless spaces in <pre/> locking-sanlock.html.in: Kill useless spaces in <pre/> logging.html.in: Kill useless spaces in <pre/> migration.html.in: Kill useless spaces in <pre/> storage.html.in: Kill useless spaces in <pre/> docs/aclpolkit.html.in | 6 +- docs/cgroups.html.in | 10 +- docs/compiling.html.in | 34 +- docs/devguide.html.in | 12 +- docs/downloads.html.in | 6 +- docs/drvbhyve.html.in | 34 +- docs/drvesx.html.in | 44 +- docs/drvlxc.html.in | 12 +- docs/format.html.in | 2 +- docs/formatcaps.html.in | 2 +- docs/formatdomain.html.in | 2338 +++++++++++++++++----------------- docs/formatnetwork.html.in | 320 ++--- docs/formatnwfilter.html.in | 210 +-- docs/formatsecret.html.in | 200 +-- docs/formatstorage.html.in | 280 ++-- docs/formatstorageencryption.html.in | 38 +- docs/internals/command.html.in | 172 +-- docs/internals/locking.html.in | 132 +- docs/internals/rpc.html.in | 220 ++-- docs/locking-lockd.html.in | 32 +- docs/locking-sanlock.html.in | 40 +- docs/logging.html.in | 38 +- docs/migration.html.in | 48 +- docs/storage.html.in | 296 ++--- 24 files changed, 2263 insertions(+), 2263 deletions(-) -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/aclpolkit.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index dd4c5fb..7967a0f 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -334,9 +334,9 @@ </p> <pre> - polkit.addRule(function(action, subject) { - ....logic to check 'action' and 'subject'... - }); +polkit.addRule(function(action, subject) { + ....logic to check 'action' and 'subject'... +}); </pre> <p> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/cgroups.html.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/cgroups.html.in b/docs/cgroups.html.in index 33de453..60b47da 100644 --- a/docs/cgroups.html.in +++ b/docs/cgroups.html.in @@ -221,11 +221,11 @@ $ROOT </p> <pre> - ... - <resource> - <partition>/machine/production</partition> - </resource> - ... +... +<resource> + <partition>/machine/production</partition> +</resource> +... </pre> <p> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/compiling.html.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/compiling.html.in b/docs/compiling.html.in index d2a3f15..3a0c7fd 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -13,9 +13,9 @@ </p> <pre> - $ xz -c libvirt-x.x.x.tar.xz | tar xvf - - $ cd libvirt-x.x.x - $ ./configure</pre> +$ xz -c libvirt-x.x.x.tar.xz | tar xvf - +$ cd libvirt-x.x.x +$ ./configure</pre> <p> The <i>configure</i> script can be given options to change its default @@ -28,7 +28,7 @@ </p> <pre> - $ ./configure <i>--help</i></pre> +$ ./configure <i>--help</i></pre> <p> When you have determined which options you want to use (if any), @@ -49,9 +49,9 @@ </p> <pre> - $ ./configure <i>[possible options]</i> - $ make - $ <b>sudo</b> <i>make install</i></pre> +$ ./configure <i>[possible options]</i> +$ make +$ <b>sudo</b> <i>make install</i></pre> <p> At this point you <b>may</b> have to run ldconfig or a similar utility @@ -91,7 +91,7 @@ drive or manual download, and run this any time libvirt.git updates the commit stored in the .gnulib submodule:</p> <pre> - $ GNULIB_SRCDIR=/path/to/gnulib ./autogen.sh --no-git +$ GNULIB_SRCDIR=/path/to/gnulib ./autogen.sh --no-git </pre> <p>To build & install libvirt to your home @@ -99,9 +99,9 @@ </p> <pre> - $ ./autogen.sh --prefix=$HOME/usr - $ make - $ <b>sudo</b> make install</pre> +$ ./autogen.sh --prefix=$HOME/usr +$ make +$ <b>sudo</b> make install</pre> <p> Be aware though, that binaries built with a custom prefix will not @@ -111,8 +111,8 @@ </p> <pre> - $ ./autogen.sh --system - $ make +$ ./autogen.sh --system +$ make </pre> <p> @@ -123,9 +123,9 @@ </p> <pre> - $ su - - # service libvirtd stop (or systemctl stop libvirtd.service) - # /home/to/your/checkout/daemon/libvirtd +$ su - +# service libvirtd stop (or systemctl stop libvirtd.service) +# /home/to/your/checkout/daemon/libvirtd </pre> <p> @@ -134,7 +134,7 @@ </p> <pre> - $ ./run ./tools/virsh .... +$ ./run ./tools/virsh .... </pre> </body> </html> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/devguide.html.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/devguide.html.in b/docs/devguide.html.in index 639e495..6b6cae2 100644 --- a/docs/devguide.html.in +++ b/docs/devguide.html.in @@ -28,14 +28,14 @@ </p> <pre> - # C language - $ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide.git">git://libvirt.org/libvirt-appdev-guide.git</a> +# C language +$ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide.git">git://libvirt.org/libvirt-appdev-guide.git</a> - # Python language - $ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide-python.git">git://libvirt.org/libvirt-appdev-guide-python.git</a> +# Python language +$ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide-python.git">git://libvirt.org/libvirt-appdev-guide-python.git</a> - # Publican Style/Theme - $ git clone <a href="http://libvirt.org/git/?p=libvirt-publican.git">git://libvirt.org/libvirt-publican.git</a> +# Publican Style/Theme +$ git clone <a href="http://libvirt.org/git/?p=libvirt-publican.git">git://libvirt.org/libvirt-publican.git</a> </pre> </body> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/downloads.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index eb1dd27..f34e9a6 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -437,7 +437,7 @@ </p> <pre> - git clone git://libvirt.org/[module name].git</pre> +git clone git://libvirt.org/[module name].git</pre> <p> In addition to this primary repository, there are the following read-only git @@ -449,8 +449,8 @@ </p> <pre> - <a href="https://github.com/libvirt/">https://github.com/libvirt/</a> - <a href="https://gitlab.com/libvirt/libvirt">https://gitlab.com/libvirt/</a></pre> +<a href="https://github.com/libvirt/">https://github.com/libvirt/</a> +<a href="https://gitlab.com/libvirt/libvirt">https://gitlab.com/libvirt/</a></pre> </body> </html> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/drvbhyve.html.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 485b051..9b7872b 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -154,13 +154,13 @@ the following to the domain XML (<span class="since">Since 1.2.4</span>): </p> <pre> - ... - <devices> - <serial type="nmdm"> - <source master="/dev/nmdm0A" slave="/dev/nmdm0B"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="nmdm"> + <source master="/dev/nmdm0A" slave="/dev/nmdm0B"/> + </serial> +</devices> +...</pre> <p>Make sure to load the <code>nmdm</code> kernel module if you plan to use that.</p> @@ -219,12 +219,12 @@ tweak them.</p> An example of domain XML device entry for that will look like:</p> <pre> - ... - <disk type='volume' device='disk'> - <source pool='zfspool' volume='vol1'/> - <target dev='vdb' bus='virtio'/> - </disk> - ...</pre> +... +<disk type='volume' device='disk'> + <source pool='zfspool' volume='vol1'/> + <target dev='vdb' bus='virtio'/> +</disk> +...</pre> <p>Please refer to the <a href="storage.html">Storage documentation</a> for more details on storage management.</p> @@ -241,10 +241,10 @@ the first disk in the domain (either <code>cdrom</code>- or attempt to boot from the first partition in the disk image.</p> <pre> - ... - <bootloader>/usr/local/sbin/grub-bhyve</bootloader> - <bootloader_args>...</bootloader_args> - ... +... +<bootloader>/usr/local/sbin/grub-bhyve</bootloader> +<bootloader_args>...</bootloader_args> +... </pre> <p>Caveat: <code>bootloader_args</code> does not support any quoting. -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/drvesx.html.in | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index d1e67d0..5ba7bc1 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -467,14 +467,14 @@ ethernet0.checkMACAddress = "false" Here a domain XML snippet: </p> <pre> - ... - <disk type='file' device='disk'> - <source file='[local-storage] Fedora11/Fedora11.vmdk'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' unit='0'/> - </disk> - <controller type='scsi' index='0' model='<strong>lsilogic</strong>'/> - ... +... +<disk type='file' device='disk'> + <source file='[local-storage] Fedora11/Fedora11.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> +</disk> +<controller type='scsi' index='0' model='<strong>lsilogic</strong>'/> +... </pre> <p> The controller element is supported <span class="since">since 0.8.2</span>. @@ -482,13 +482,13 @@ ethernet0.checkMACAddress = "false" specify the SCSI controller model. This attribute usage is deprecated now. </p> <pre> - ... - <disk type='file' device='disk'> - <driver name='<strong>lsilogic</strong>'/> - <source file='[local-storage] Fedora11/Fedora11.vmdk'/> - <target dev='sda' bus='scsi'/> - </disk> - ... +... +<disk type='file' device='disk'> + <driver name='<strong>lsilogic</strong>'/> + <source file='[local-storage] Fedora11/Fedora11.vmdk'/> + <target dev='sda' bus='scsi'/> +</disk> +... </pre> @@ -513,13 +513,13 @@ ethernet0.checkMACAddress = "false" Here a domain XML snippet: </p> <pre> - ... - <interface type='bridge'> - <mac address='00:50:56:25:48:c7'/> - <source bridge='VM Network'/> - <model type='<strong>e1000</strong>'/> - </interface> - ... +... +<interface type='bridge'> + <mac address='00:50:56:25:48:c7'/> + <source bridge='VM Network'/> + <model type='<strong>e1000</strong>'/> +</interface> +... </pre> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/drvlxc.html.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 4f86535..c0c26ca 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -62,12 +62,12 @@ would use the following XML </p> <pre> - <os> - <type arch='x86_64'>exe</type> - <init>/bin/systemd</init> - <initarg>--unit</initarg> - <initarg>emergency.service</initarg> - </os> +<os> + <type arch='x86_64'>exe</type> + <init>/bin/systemd</init> + <initarg>--unit</initarg> + <initarg>emergency.service</initarg> +</os> </pre> <h3><a name="envvars">Environment variables</a></h3> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/format.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/format.html.in b/docs/format.html.in index 56ec76f..41211a9 100644 --- a/docs/format.html.in +++ b/docs/format.html.in @@ -38,7 +38,7 @@ </p> <pre> - $ virt-xml-validate /path/to/XML/file</pre> +$ virt-xml-validate /path/to/XML/file</pre> </body> </html> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/formatcaps.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 0ba567c..57201b5 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -13,7 +13,7 @@ interface has been added in 0.2.1 allowing to list the set of supported virtualization capabilities on the host:</p> - <pre> char * virConnectGetCapabilities (virConnectPtr conn);</pre> + <pre>char * virConnectGetCapabilities (virConnectPtr conn);</pre> <p>The value returned is an XML document listing the virtualization capabilities of the host and virtualization engine to which -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/formatdomain.html.in | 2338 ++++++++++++++++++++++----------------------- 1 file changed, 1169 insertions(+), 1169 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 11b3330..4e40aa1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -99,18 +99,18 @@ </p> <pre> - ... - <os> - <type>hvm</type> - <loader readonly='yes' secure='no' type='rom'>/usr/lib/xen/boot/hvmloader</loader> - <nvram template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/nvram/guest_VARS.fd</nvram> - <boot dev='hd'/> - <boot dev='cdrom'/> - <bootmenu enable='yes' timeout='3000'/> - <smbios mode='sysinfo'/> - <bios useserial='yes' rebootTimeout='0'/> - </os> - ...</pre> +... +<os> + <type>hvm</type> + <loader readonly='yes' secure='no' type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <nvram template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/nvram/guest_VARS.fd</nvram> + <boot dev='hd'/> + <boot dev='cdrom'/> + <bootmenu enable='yes' timeout='3000'/> + <smbios mode='sysinfo'/> + <bios useserial='yes' rebootTimeout='0'/> +</os> +...</pre> <dl> <dt><code>type</code></dt> @@ -242,10 +242,10 @@ </p> <pre> - ... - <bootloader>/usr/bin/pygrub</bootloader> - <bootloader_args>--append single</bootloader_args> - ...</pre> +... +<bootloader>/usr/bin/pygrub</bootloader> +<bootloader_args>--append single</bootloader_args> +...</pre> <dl> <dt><code>bootloader</code></dt> @@ -272,19 +272,19 @@ </p> <pre> - ... - <os> - <type>hvm</type> - <loader>/usr/lib/xen/boot/hvmloader</loader> - <kernel>/root/f8-i386-vmlinuz</kernel> - <initrd>/root/f8-i386-initrd</initrd> - <cmdline>console=ttyS0 ks=http://example.com/f8-i386/os/</cmdline>; - <dtb>/root/ppc.dtb</dtb> - <acpi> - <table type='slic'>/path/to/slic.dat</table> - </acpi> - </os> - ...</pre> +... +<os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <kernel>/root/f8-i386-vmlinuz</kernel> + <initrd>/root/f8-i386-initrd</initrd> + <cmdline>console=ttyS0 ks=http://example.com/f8-i386/os/</cmdline>; + <dtb>/root/ppc.dtb</dtb> + <acpi> + <table type='slic'>/path/to/slic.dat</table> + </acpi> +</os> +...</pre> <dl> <dt><code>type</code></dt> @@ -328,12 +328,12 @@ </p> <pre> - <os> - <type arch='x86_64'>exe</type> - <init>/bin/systemd</init> - <initarg>--unit</initarg> - <initarg>emergency.service</initarg> - </os> +<os> + <type arch='x86_64'>exe</type> + <init>/bin/systemd</init> + <initarg>--unit</initarg> + <initarg>emergency.service</initarg> +</os> </pre> @@ -353,10 +353,10 @@ </dl> <pre> - <idmap> - <uid start='0' target='1000' count='10'/> - <gid start='0' target='1000' count='10'/> - </idmap> +<idmap> + <uid start='0' target='1000' count='10'/> + <gid start='0' target='1000' count='10'/> +</idmap> </pre> @@ -372,28 +372,28 @@ </p> <pre> +... +<os> + <smbios mode='sysinfo'/> ... - <os> - <smbios mode='sysinfo'/> - ... - </os> - <sysinfo type='smbios'> - <bios> - <entry name='vendor'>LENOVO</entry> - </bios> - <system> - <entry name='manufacturer'>Fedora</entry> - <entry name='product'>Virt-Manager</entry> - <entry name='version'>0.9.4</entry> - </system> - <baseBoard> - <entry name='manufacturer'>LENOVO</entry> - <entry name='product'>20BE0061MC</entry> - <entry name='version'>0B98401 Pro</entry> - <entry name='serial'>W1KS427111E</entry> - </baseBoard> - </sysinfo> - ...</pre> +</os> +<sysinfo type='smbios'> + <bios> + <entry name='vendor'>LENOVO</entry> + </bios> + <system> + <entry name='manufacturer'>Fedora</entry> + <entry name='product'>Virt-Manager</entry> + <entry name='version'>0.9.4</entry> + </system> + <baseBoard> + <entry name='manufacturer'>LENOVO</entry> + <entry name='product'>20BE0061MC</entry> + <entry name='version'>0B98401 Pro</entry> + <entry name='serial'>W1KS427111E</entry> + </baseBoard> +</sysinfo> +...</pre> <p> The <code>sysinfo</code> element has a mandatory @@ -1149,11 +1149,11 @@ by default. </p> <pre> - ... - <resource> - <partition>/virtualmachines/production</partition> - </resource> - ... +... +<resource> + <partition>/virtualmachines/production</partition> +</resource> +... </pre> <p> @@ -1171,26 +1171,26 @@ </p> <pre> - ... - <cpu match='exact'> - <model fallback='allow'>core2duo</model> - <vendor>Intel</vendor> - <topology sockets='1' cores='2' threads='1'/> - <feature policy='disable' name='lahf_lm'/> - </cpu> - ...</pre> +... +<cpu match='exact'> + <model fallback='allow'>core2duo</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='1'/> + <feature policy='disable' name='lahf_lm'/> +</cpu> +...</pre> <pre> - <cpu mode='host-model'> - <model fallback='forbid'/> - <topology sockets='1' cores='2' threads='1'/> - </cpu> - ...</pre> +<cpu mode='host-model'> + <model fallback='forbid'/> + <topology sockets='1' cores='2' threads='1'/> +</cpu> +...</pre> <pre> - <cpu mode='host-passthrough'> - <feature policy='disable' name='lahf_lm'/> - ...</pre> +<cpu mode='host-passthrough'> + <feature policy='disable' name='lahf_lm'/> +...</pre> <p> In case no restrictions need to be put on CPU model and its features, a @@ -1199,11 +1199,11 @@ </p> <pre> - ... - <cpu> - <topology sockets='1' cores='2' threads='1'/> - </cpu> - ...</pre> +... +<cpu> + <topology sockets='1' cores='2' threads='1'/> +</cpu> +...</pre> <dl> <dt><code>cpu</code></dt> @@ -1281,10 +1281,10 @@ When a user needs a power7 VM to run in compatibility mode on a Power8 host, this can be described in XML as follows : <pre> - <cpu mode='host-model'> - <model>power7</model> - </cpu> - ...</pre> +<cpu mode='host-model'> + <model>power7</model> +</cpu> +...</pre> </dd> <dt><code>host-passthrough</code></dt> <dd>With this mode, the CPU visible to the guest should be exactly @@ -1374,16 +1374,16 @@ </p> <pre> +... +<cpu> ... - <cpu> - ... - <numa> - <cell id='0' cpus='0-3' memory='512000' unit='KiB'/> - <cell id='1' cpus='4-7' memory='512000' unit='KiB' memAccess='shared'/> - </numa> - ... - </cpu> - ...</pre> + <numa> + <cell id='0' cpus='0-3' memory='512000' unit='KiB'/> + <cell id='1' cpus='4-7' memory='512000' unit='KiB' memAccess='shared'/> + </numa> + ... +</cpu> +...</pre> <p> Each <code>cell</code> element specifies a NUMA cell or a NUMA node. @@ -1431,12 +1431,12 @@ </p> <pre> - ... - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <on_lockfailure>poweroff</on_lockfailure> - ...</pre> +... +<on_poweroff>destroy</on_poweroff> +<on_reboot>restart</on_reboot> +<on_crash>restart</on_crash> +<on_lockfailure>poweroff</on_lockfailure> +...</pre> <p> The following collections of elements allow the actions to be @@ -1530,12 +1530,12 @@ </p> <pre> - ... - <pm> - <suspend-to-disk enabled='no'/> - <suspend-to-mem enabled='yes'/> - </pm> - ...</pre> +... +<pm> + <suspend-to-disk enabled='no'/> + <suspend-to-mem enabled='yes'/> +</pm> +...</pre> <dl> <dt><code>pm</code></dt> @@ -1553,31 +1553,31 @@ </p> <pre> - ... - <features> - <pae/> - <acpi/> - <apic/> - <hap/> - <privnet/> - <hyperv> - <relaxed state='on'/> - <vapic state='on'/> - <spinlocks state='on' retries='4096'/> - <vpindex state='on'/> - <runtime state='on'/> - <synic state='on'/> - <reset state='on'/> - <vendor_id state='on' value='KVM Hv'/> - </hyperv> - <kvm> - <hidden state='on'/> - </kvm> - <pvspinlock state='on'/> - <gic version='2'/> +... +<features> + <pae/> + <acpi/> + <apic/> + <hap/> + <privnet/> + <hyperv> + <relaxed state='on'/> + <vapic state='on'/> + <spinlocks state='on' retries='4096'/> + <vpindex state='on'/> + <runtime state='on'/> + <synic state='on'/> + <reset state='on'/> + <vendor_id state='on' value='KVM Hv'/> + </hyperv> + <kvm> + <hidden state='on'/> + </kvm> + <pvspinlock state='on'/> + <gic version='2'/> - </features> - ...</pre> +</features> +...</pre> <p> All features are listed within the <code>features</code> @@ -1748,14 +1748,14 @@ </p> <pre> - ... - <clock offset='localtime'> - <timer name='rtc' tickpolicy='catchup' track='guest'> - <catchup threshold='123' slew='120' limit='10000'/> - </timer> - <timer name='pit' tickpolicy='delay'/> - </clock> - ...</pre> +... +<clock offset='localtime'> + <timer name='rtc' tickpolicy='catchup' track='guest'> + <catchup threshold='123' slew='120' limit='10000'/> + </timer> + <timer name='pit' tickpolicy='delay'/> +</clock> +...</pre> <dl> <dt><code>clock</code></dt> @@ -1918,17 +1918,17 @@ </p> <pre> - ... - <perf> - <event name='cmt' enabled='yes'/> - <event name='mbmt' enabled='no'/> - <event name='mbml' enabled='yes'/> - <event name='cpu_cycles' enabled='no'/> - <event name='instructions' enabled='yes'/> - <event name='cache_references' enabled='no'/> - <event name='cache_misses' enabled='no'/> - </perf> - ... +... +<perf> + <event name='cmt' enabled='yes'/> + <event name='mbmt' enabled='no'/> + <event name='mbml' enabled='yes'/> + <event name='cpu_cycles' enabled='no'/> + <event name='instructions' enabled='yes'/> + <event name='cache_references' enabled='no'/> + <event name='cache_misses' enabled='no'/> +</perf> +... </pre> <table class="top_table"> @@ -1984,11 +1984,11 @@ </p> <pre> - ... - <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> - </devices> - ...</pre> +... +<devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> +</devices> +...</pre> <dl> <dt><code>emulator</code></dt> @@ -2010,166 +2010,166 @@ </p> <pre> - ... - <devices> - <disk type='file' snapshot='external'> - <driver name="tap" type="aio" cache="default"/> - <source file='/var/lib/xen/images/fv0' startupPolicy='optional'> - <seclabel relabel='no'/> - </source> - <target dev='hda' bus='ide'/> - <iotune> - <total_bytes_sec>10000000</total_bytes_sec> - <read_iops_sec>400000</read_iops_sec> - <write_iops_sec>100000</write_iops_sec> - </iotune> - <boot order='2'/> - <encryption type='...'> - ... - </encryption> - <shareable/> - <serial> - ... - </serial> - </disk> +... +<devices> + <disk type='file' snapshot='external'> + <driver name="tap" type="aio" cache="default"/> + <source file='/var/lib/xen/images/fv0' startupPolicy='optional'> + <seclabel relabel='no'/> + </source> + <target dev='hda' bus='ide'/> + <iotune> + <total_bytes_sec>10000000</total_bytes_sec> + <read_iops_sec>400000</read_iops_sec> + <write_iops_sec>100000</write_iops_sec> + </iotune> + <boot order='2'/> + <encryption type='...'> ... - <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"/> - </source> - <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"/> - <snapshot name="snapname"/> - <config file="/path/to/file"/> - </source> - <target dev="hdc" bus="ide"/> - <auth username='myuser'> - <secret type='ceph' usage='mypassid'/> - </auth> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <target dev='hdd' bus='ide' tray='open'/> - <readonly/> - </disk> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol="http" name="url_path"> - <host name="hostname" port="80"/> - </source> - <target dev='hde' bus='ide' tray='open'/> - <readonly/> - </disk> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol="https" name="url_path"> - <host name="hostname" port="443"/> - </source> - <target dev='hdf' bus='ide' tray='open'/> - <readonly/> - </disk> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol="ftp" name="url_path"> - <host name="hostname" port="21"/> - </source> - <target dev='hdg' bus='ide' tray='open'/> - <readonly/> - </disk> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol="ftps" name="url_path"> - <host name="hostname" port="990"/> - </source> - <target dev='hdh' bus='ide' tray='open'/> - <readonly/> - </disk> - <disk type='network' device='cdrom'> - <driver name='qemu' type='raw'/> - <source protocol="tftp" name="url_path"> - <host name="hostname" port="69"/> - </source> - <target dev='hdi' bus='ide' tray='open'/> - <readonly/> - </disk> - <disk type='block' device='lun'> - <driver name='qemu' type='raw'/> - <source dev='/dev/sda'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='3' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/sda'/> - <geometry cyls='16383' heads='16' secs='63' trans='lba'/> - <blockio logical_block_size='512' physical_block_size='4096'/> - <target dev='hdj' bus='ide'/> - </disk> - <disk type='volume' device='disk'> - <driver name='qemu' type='raw'/> - <source pool='blk-pool0' volume='blk-pool0-vol0'/> - <target dev='hdk' bus='ide'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/2'> - <host name='example.com' port='3260'/> - </source> - <auth username='myuser'> - <secret type='iscsi' usage='libvirtiscsi'/> - </auth> - <target dev='vda' bus='virtio'/> - </disk> - <disk type='network' device='lun'> - <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/1'> - <host name='example.com' port='3260'/> - </source> - <auth username='myuser'> - <secret type='iscsi' usage='libvirtiscsi'/> - </auth> - <target dev='sdb' bus='scsi'/> - </disk> - <disk type='volume' device='disk'> - <driver name='qemu' type='raw'/> - <source pool='iscsi-pool' volume='unit:0:0:1' mode='host'/> - <auth username='myuser'> - <secret type='iscsi' usage='libvirtiscsi'/> - </auth> - <target dev='vdb' bus='virtio'/> - </disk> - <disk type='volume' device='disk'> - <driver name='qemu' type='raw'/> - <source pool='iscsi-pool' volume='unit:0:0:2' mode='direct'/> - <auth username='myuser'> - <secret type='iscsi' usage='libvirtiscsi'/> - </auth> - <target dev='vdc' bus='virtio'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/domain.qcow'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/snapshot.qcow'/> - <backingStore type='block'> - <format type='raw'/> - <source dev='/dev/mapper/base'/> - <backingStore/> - </backingStore> + </encryption> + <shareable/> + <serial> + ... + </serial> + </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"/> + </source> + <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"/> + <snapshot name="snapname"/> + <config file="/path/to/file"/> + </source> + <target dev="hdc" bus="ide"/> + <auth username='myuser'> + <secret type='ceph' usage='mypassid'/> + </auth> + </disk> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='hdd' bus='ide' tray='open'/> + <readonly/> + </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol="http" name="url_path"> + <host name="hostname" port="80"/> + </source> + <target dev='hde' bus='ide' tray='open'/> + <readonly/> + </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol="https" name="url_path"> + <host name="hostname" port="443"/> + </source> + <target dev='hdf' bus='ide' tray='open'/> + <readonly/> + </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol="ftp" name="url_path"> + <host name="hostname" port="21"/> + </source> + <target dev='hdg' bus='ide' tray='open'/> + <readonly/> + </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol="ftps" name="url_path"> + <host name="hostname" port="990"/> + </source> + <target dev='hdh' bus='ide' tray='open'/> + <readonly/> + </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol="tftp" name="url_path"> + <host name="hostname" port="69"/> + </source> + <target dev='hdi' bus='ide' tray='open'/> + <readonly/> + </disk> + <disk type='block' device='lun'> + <driver name='qemu' type='raw'/> + <source dev='/dev/sda'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='3' unit='0'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/sda'/> + <geometry cyls='16383' heads='16' secs='63' trans='lba'/> + <blockio logical_block_size='512' physical_block_size='4096'/> + <target dev='hdj' bus='ide'/> + </disk> + <disk type='volume' device='disk'> + <driver name='qemu' type='raw'/> + <source pool='blk-pool0' volume='blk-pool0-vol0'/> + <target dev='hdk' bus='ide'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/2'> + <host name='example.com' port='3260'/> + </source> + <auth username='myuser'> + <secret type='iscsi' usage='libvirtiscsi'/> + </auth> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='lun'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/1'> + <host name='example.com' port='3260'/> + </source> + <auth username='myuser'> + <secret type='iscsi' usage='libvirtiscsi'/> + </auth> + <target dev='sdb' bus='scsi'/> + </disk> + <disk type='volume' device='disk'> + <driver name='qemu' type='raw'/> + <source pool='iscsi-pool' volume='unit:0:0:1' mode='host'/> + <auth username='myuser'> + <secret type='iscsi' usage='libvirtiscsi'/> + </auth> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='volume' device='disk'> + <driver name='qemu' type='raw'/> + <source pool='iscsi-pool' volume='unit:0:0:2' mode='direct'/> + <auth username='myuser'> + <secret type='iscsi' usage='libvirtiscsi'/> + </auth> + <target dev='vdc' bus='virtio'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/domain.qcow'/> + <backingStore type='file'> + <format type='qcow2'/> + <source file='/var/lib/libvirt/images/snapshot.qcow'/> + <backingStore type='block'> + <format type='raw'/> + <source dev='/dev/mapper/base'/> + <backingStore/> </backingStore> - <target dev='vdd' bus='virtio'/> - </disk> - </devices> - ...</pre> + </backingStore> + <target dev='vdd' bus='virtio'/> + </disk> +</devices> +...</pre> <dl> <dt><code>disk</code></dt> @@ -2929,28 +2929,28 @@ </p> <pre> +... +<devices> + <filesystem type='template'> + <source name='my-vm-template'/> + <target dir='/'/> + </filesystem> + <filesystem type='mount' accessmode='passthrough'> + <driver type='path' wrpolicy='immediate'/> + <source dir='/export/to/guest'/> + <target dir='/import/from/host'/> + <readonly/> + </filesystem> + <filesystem type='file' accessmode='passthrough'> + <driver name='loop' type='raw'/> + <driver type='path' wrpolicy='immediate'/> + <source file='/export/to/guest.img'/> + <target dir='/import/from/host'/> + <readonly/> + </filesystem> ... - <devices> - <filesystem type='template'> - <source name='my-vm-template'/> - <target dir='/'/> - </filesystem> - <filesystem type='mount' accessmode='passthrough'> - <driver type='path' wrpolicy='immediate'/> - <source dir='/export/to/guest'/> - <target dir='/import/from/host'/> - <readonly/> - </filesystem> - <filesystem type='file' accessmode='passthrough'> - <driver name='loop' type='raw'/> - <driver type='path' wrpolicy='immediate'/> - <source file='/export/to/guest.img'/> - <target dir='/import/from/host'/> - <readonly/> - </filesystem> - ... - </devices> - ...</pre> +</devices> +...</pre> <dl> <dt><code>filesystem</code></dt> @@ -3221,20 +3221,20 @@ </p> <pre> +... +<devices> + <controller type='ide' index='0'/> + <controller type='virtio-serial' index='0' ports='16' vectors='4'/> + <controller type='virtio-serial' index='1'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> + </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <driver iothread='4'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> + </controller> ... - <devices> - <controller type='ide' index='0'/> - <controller type='virtio-serial' index='0' ports='16' vectors='4'/> - <controller type='virtio-serial' index='1'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> - </controller> - <controller type='scsi' index='0' model='virtio-scsi'> - <driver iothread='4'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> - </controller> - ... - </devices> - ...</pre> +</devices> +...</pre> <p> Each controller has a mandatory attribute <code>type</code>, @@ -3356,18 +3356,18 @@ </p> <pre> +... +<devices> + <controller type='usb' index='0' model='ich9-ehci1'> + <address type='pci' domain='0' bus='0' slot='4' function='7'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci1'> + <master startport='0'/> + <address type='pci' domain='0' bus='0' slot='4' function='0' multifunction='on'/> + </controller> ... - <devices> - <controller type='usb' index='0' model='ich9-ehci1'> - <address type='pci' domain='0' bus='0' slot='4' function='7'/> - </controller> - <controller type='usb' index='0' model='ich9-uhci1'> - <master startport='0'/> - <address type='pci' domain='0' bus='0' slot='4' function='0' multifunction='on'/> - </controller> - ... - </devices> - ...</pre> +</devices> +...</pre> <p> PCI controllers have an optional <code>model</code> attribute with @@ -3507,14 +3507,14 @@ configuration. </p> <pre> - ... - <devices> - <controller type='pci' index='0' model='pci-root'/> - <controller type='pci' index='1' model='pci-bridge'> - <address type='pci' domain='0' bus='0' slot='5' function='0' multifunction='off'/> - </controller> - </devices> - ...</pre> +... +<devices> + <controller type='pci' index='0' model='pci-root'/> + <controller type='pci' index='1' model='pci-bridge'> + <address type='pci' domain='0' bus='0' slot='5' function='0' multifunction='off'/> + </controller> +</devices> +...</pre> <p> For machine types which provide an implicit PCI Express (PCIe) @@ -3569,17 +3569,17 @@ 1.2.19</span>) </p> <pre> - ... - <devices> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='dmi-to-pci-bridge'> - <address type='pci' domain='0' bus='0' slot='0xe' function='0'/> - </controller> - <controller type='pci' index='2' model='pci-bridge'> - <address type='pci' domain='0' bus='1' slot='1' function='0'/> - </controller> - </devices> - ...</pre> +... +<devices> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <address type='pci' domain='0' bus='0' slot='0xe' function='0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <address type='pci' domain='0' bus='1' slot='1' function='0'/> + </controller> +</devices> +...</pre> <h4><a name="elementsLease">Device leases</a></h4> @@ -3590,17 +3590,17 @@ </p> <pre> +... +<devices> ... - <devices> - ... - <lease> - <lockspace>somearea</lockspace> - <key>somekey</key> - <target path='/some/lease/path' offset='1024'/> - </lease> - ... - </devices> - ...</pre> + <lease> + <lockspace>somearea</lockspace> + <key>somekey</key> + <target path='/some/lease/path' offset='1024'/> + </lease> + ... +</devices> +...</pre> <dl> <dt><code>lockspace</code></dt> @@ -3633,66 +3633,66 @@ </p> <pre> - ... - <devices> - <hostdev mode='subsystem' type='usb'> - <source startupPolicy='optional'> - <vendor id='0x1234'/> - <product id='0xbeef'/> - </source> - <boot order='2'/> - </hostdev> - </devices> - ...</pre> +... +<devices> + <hostdev mode='subsystem' type='usb'> + <source startupPolicy='optional'> + <vendor id='0x1234'/> + <product id='0xbeef'/> + </source> + <boot order='2'/> + </hostdev> +</devices> +...</pre> <p>or:</p> <pre> - ... - <devices> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x06' slot='0x02' function='0x0'/> - </source> - <boot order='1'/> - <rom bar='on' file='/etc/fake/boot.bin'/> - </hostdev> - </devices> - ...</pre> +... +<devices> + <hostdev mode='subsystem' type='pci' managed='yes'> + <source> + <address domain='0x0000' bus='0x06' slot='0x02' function='0x0'/> + </source> + <boot order='1'/> + <rom bar='on' file='/etc/fake/boot.bin'/> + </hostdev> +</devices> +...</pre> <p>or:</p> <pre> - ... - <devices> - <hostdev mode='subsystem' type='scsi' sgio='filtered' rawio='yes'> - <source> - <adapter name='scsi_host0'/> - <address bus='0' target='0' unit='0'/> - </source> - <readonly/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </hostdev> - </devices> - ...</pre> +... +<devices> + <hostdev mode='subsystem' type='scsi' sgio='filtered' rawio='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + <readonly/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </hostdev> +</devices> +...</pre> <p>or:</p> <pre> - ... - <devices> - <hostdev mode='subsystem' type='scsi'> - <source protocol='iscsi' name='iqn.2014-08.com.example:iscsi-nopool/1'> - <host name='example.com' port='3260'/> - <auth username='myuser'> - <secret type='iscsi' usage='libvirtiscsi'/> - </auth> - </source> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </hostdev> - </devices> - ...</pre> +... +<devices> + <hostdev mode='subsystem' type='scsi'> + <source protocol='iscsi' name='iqn.2014-08.com.example:iscsi-nopool/1'> + <host name='example.com' port='3260'/> + <auth username='myuser'> + <secret type='iscsi' usage='libvirtiscsi'/> + </auth> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </hostdev> +</devices> +...</pre> <dl> <dt><code>hostdev</code></dt> @@ -3942,18 +3942,18 @@ </p> <pre> - ... - <devices> - <redirdev bus='usb' type='tcp'> - <source mode='connect' host='localhost' service='4000'/> - <boot order='1'/> - </redirdev> - <redirfilter> - <usbdev class='0x08' vendor='0x1234' product='0xbeef' version='2.56' allow='yes'/> - <usbdev allow='no'/> - </redirfilter> - </devices> - ...</pre> +... +<devices> + <redirdev bus='usb' type='tcp'> + <source mode='connect' host='localhost' service='4000'/> + <boot order='1'/> + </redirdev> + <redirfilter> + <usbdev class='0x08' vendor='0x1234' product='0xbeef' version='2.56' allow='yes'/> + <usbdev allow='no'/> + </redirfilter> +</devices> +...</pre> <dl> <dt><code>redirdev</code></dt> @@ -4016,23 +4016,23 @@ </p> <pre> - ... - <devices> - <smartcard mode='host'/> - <smartcard mode='host-certificates'> - <certificate>cert1</certificate> - <certificate>cert2</certificate> - <certificate>cert3</certificate> - <database>/etc/pki/nssdb/</database> - </smartcard> - <smartcard mode='passthrough' type='tcp'> - <source mode='bind' host='127.0.0.1' service='2001'/> - <protocol type='raw'/> - <address type='ccid' controller='0' slot='0'/> - </smartcard> - <smartcard mode='passthrough' type='spicevmc'/> - </devices> - ... +... +<devices> + <smartcard mode='host'/> + <smartcard mode='host-certificates'> + <certificate>cert1</certificate> + <certificate>cert2</certificate> + <certificate>cert3</certificate> + <database>/etc/pki/nssdb/</database> + </smartcard> + <smartcard mode='passthrough' type='tcp'> + <source mode='bind' host='127.0.0.1' service='2001'/> + <protocol type='raw'/> + <address type='ccid' controller='0' slot='0'/> + </smartcard> + <smartcard mode='passthrough' type='spicevmc'/> +</devices> +... </pre> <p> @@ -4096,16 +4096,16 @@ <h4><a name="elementsNICS">Network interfaces</a></h4> <pre> - ... - <devices> - <interface type='direct' trustGuestRxFilters='yes'> - <source dev='eth0'/> - <mac address='52:54:00:5d:c7:9e'/> - <boot order='1'/> - <rom bar='off'/> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='direct' trustGuestRxFilters='yes'> + <source dev='eth0'/> + <mac address='52:54:00:5d:c7:9e'/> + <boot order='1'/> + <rom bar='off'/> + </interface> +</devices> +...</pre> <p> There are several possibilities for specifying a network @@ -4221,23 +4221,23 @@ </p> <pre> +... +<devices> + <interface type='network'> + <source network='default'/> + </interface> ... - <devices> - <interface type='network'> - <source network='default'/> - </interface> - ... - <interface type='network'> - <source network='default' portgroup='engineering'/> - <target dev='vnet7'/> - <mac address="00:11:22:33:44:55"/> - <virtualport> - <parameters instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> - </virtualport> + <interface type='network'> + <source network='default' portgroup='engineering'/> + <target dev='vnet7'/> + <mac address="00:11:22:33:44:55"/> + <virtualport> + <parameters instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> + </virtualport> - </interface> - </devices> - ...</pre> + </interface> +</devices> +...</pre> <h5><a name="elementsNICSBridge">Bridge to LAN</a></h5> @@ -4275,26 +4275,26 @@ the interfaces "port-profile". </p> <pre> +... +<devices> ... - <devices> - ... - <interface type='bridge'> - <source bridge='br0'/> - </interface> - <interface type='bridge'> - <source bridge='br1'/> - <target dev='vnet7'/> - <mac address="00:11:22:33:44:55"/> - </interface> - <interface type='bridge'> - <source bridge='ovsbr'/> - <virtualport type='openvswitch'> - <parameters profileid='menial' interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> - </virtualport> - </interface> - ... - </devices> - ...</pre> + <interface type='bridge'> + <source bridge='br0'/> + </interface> + <interface type='bridge'> + <source bridge='br1'/> + <target dev='vnet7'/> + <mac address="00:11:22:33:44:55"/> + </interface> + <interface type='bridge'> + <source bridge='ovsbr'/> + <virtualport type='openvswitch'> + <parameters profileid='menial' interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> + </virtualport> + </interface> + ... +</devices> +...</pre> <p> On hosts that support Open vSwitch on the kernel side and have the @@ -4309,26 +4309,26 @@ to the interface. </p> <pre> +... +<devices> ... - <devices> - ... - <interface type='bridge'> - <source bridge='br0'/> - </interface> - <interface type='bridge'> - <source bridge='br1'/> - <target dev='vnet7'/> - <mac address="00:11:22:33:44:55"/> - </interface> - <interface type='bridge'> - <source bridge='midonet'/> - <virtualport type='midonet'> - <parameters interfaceid='0b2d64da-3d0e-431e-afdd-804415d6ebbb'/> - </virtualport> - </interface> - ... - </devices> - ...</pre> + <interface type='bridge'> + <source bridge='br0'/> + </interface> + <interface type='bridge'> + <source bridge='br1'/> + <target dev='vnet7'/> + <mac address="00:11:22:33:44:55"/> + </interface> + <interface type='bridge'> + <source bridge='midonet'/> + <virtualport type='midonet'> + <parameters interfaceid='0b2d64da-3d0e-431e-afdd-804415d6ebbb'/> + </virtualport> + </interface> + ... +</devices> +...</pre> <h5><a name="elementsNICSSlirp">Userspace SLIRP stack</a></h5> @@ -4342,15 +4342,15 @@ </p> <pre> +... +<devices> + <interface type='user'/> ... - <devices> - <interface type='user'/> - ... - <interface type='user'> - <mac address="00:11:22:33:44:55"/> - </interface> - </devices> - ...</pre> + <interface type='user'> + <mac address="00:11:22:33:44:55"/> + </interface> +</devices> +...</pre> <h5><a name="elementsNICSEthernet">Generic ethernet connection</a></h5> @@ -4366,16 +4366,16 @@ </p> <pre> +... +<devices> + <interface type='ethernet'/> ... - <devices> - <interface type='ethernet'/> - ... - <interface type='ethernet'> - <target dev='vnet7'/> - <script path='/etc/qemu-ifup-mynet'/> - </interface> - </devices> - ...</pre> + <interface type='ethernet'> + <target dev='vnet7'/> + <script path='/etc/qemu-ifup-mynet'/> + </interface> +</devices> +...</pre> <h5><a name="elementsNICSDirect">Direct attachment to physical interface</a></h5> @@ -4433,14 +4433,14 @@ </dl> <pre> +... +<devices> ... - <devices> - ... - <interface type='direct' trustGuestRxFilters='no'> - <source dev='eth0' mode='vepa'/> - </interface> - </devices> - ...</pre> + <interface type='direct' trustGuestRxFilters='no'> + <source dev='eth0' mode='vepa'/> + </interface> +</devices> +...</pre> <p> The network access of direct attached virtual machines can be @@ -4481,17 +4481,17 @@ </dd> </dl> <pre> +... +<devices> ... - <devices> - ... - <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> - </interface> - </devices> - ...</pre> + <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> + </interface> +</devices> +...</pre> <p> The interface can have additional parameters as shown below @@ -4508,18 +4508,18 @@ </dd> </dl> <pre> +... +<devices> ... - <devices> - ... - <interface type='direct'> - <source dev='eth0' mode='private'/> - <virtualport type='802.1Qbh'> - <parameters profileid='finance'/> - </virtualport> - </interface> - </devices> - ... - </pre> + <interface type='direct'> + <source dev='eth0' mode='private'/> + <virtualport type='802.1Qbh'> + <parameters profileid='finance'/> + </virtualport> + </interface> +</devices> +... +</pre> <h5><a name="elementsNICSHostdev">PCI Passthrough</a></h5> @@ -4579,20 +4579,20 @@ </p> <pre> - ... - <devices> - <interface type='hostdev' managed='yes'> - <driver name='vfio'/> - <source> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </source> - <mac address='52:54:00:6d:90:02'/> - <virtualport type='802.1Qbh'> - <parameters profileid='finance'/> - </virtualport> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='hostdev' managed='yes'> + <driver name='vfio'/> + <source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </source> + <mac address='52:54:00:6d:90:02'/> + <virtualport type='802.1Qbh'> + <parameters profileid='finance'/> + </virtualport> + </interface> +</devices> +...</pre> <h5><a name="elementsNICSMulticast">Multicast tunnel</a></h5> @@ -4610,14 +4610,14 @@ </p> <pre> - ... - <devices> - <interface type='mcast'> - <mac address='52:54:00:6d:90:01'/> - <source address='230.0.0.1' port='5558'/> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='mcast'> + <mac address='52:54:00:6d:90:01'/> + <source address='230.0.0.1' port='5558'/> + </interface> +</devices> +...</pre> <h5><a name="elementsNICSTCP">TCP tunnel</a></h5> @@ -4631,19 +4631,19 @@ to one of the first 4 network types and do the appropriate routing.</p> <pre> +... +<devices> + <interface type='server'> + <mac address='52:54:00:22:c9:42'/> + <source address='192.168.0.1' port='5558'/> + </interface> ... - <devices> - <interface type='server'> - <mac address='52:54:00:22:c9:42'/> - <source address='192.168.0.1' port='5558'/> - </interface> - ... - <interface type='client'> - <mac address='52:54:00:8b:c9:51'/> - <source address='192.168.0.1' port='5558'/> - </interface> - </devices> - ...</pre> + <interface type='client'> + <mac address='52:54:00:8b:c9:51'/> + <source address='192.168.0.1' port='5558'/> + </interface> +</devices> +...</pre> <h5><a name="elementsNICSUDP">UDP unicast tunnel</a></h5> @@ -4658,29 +4658,29 @@ <span class="since">Since 1.2.20</span></p> <pre> - ... - <devices> - <interface type='udp'> - <mac address='52:54:00:22:c9:42'/> - <source address='127.0.0.1' port='11115'> - <local address='127.0.0.1' port='11116'/> - </source> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='udp'> + <mac address='52:54:00:22:c9:42'/> + <source address='127.0.0.1' port='11115'> + <local address='127.0.0.1' port='11116'/> + </source> + </interface> +</devices> +...</pre> <h5><a name="elementsNICSModel">Setting the NIC model</a></h5> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <target dev='vnet1'/> - <b><model type='ne2k_pci'/></b> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet1'/> + <b><model type='ne2k_pci'/></b> + </interface> +</devices> +...</pre> <p> For hypervisors which support this, you can set the model of @@ -4707,20 +4707,20 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementsDriverBackendOptions">Setting NIC driver-specific options</a></h5> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <target dev='vnet1'/> - <model type='virtio'/> - <b><driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5' rx_queue_size='256'> - <host csum='off' gso='off' tso4='off' tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/> - <guest csum='off' tso4='off' tso6='off' ecn='off' ufo='off'/> - </driver> - </b> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet1'/> + <model type='virtio'/> + <b><driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5' rx_queue_size='256'> + <host csum='off' gso='off' tso4='off' tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/> + <guest csum='off' tso4='off' tso6='off' ecn='off' ufo='off'/> + </driver> + </b> + </interface> +</devices> +...</pre> <p> Some NICs may have tunable driver-specific options. These are @@ -4876,17 +4876,17 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementsBackendOptions">Setting network backend-specific options</a></h5> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <target dev='vnet1'/> - <model type='virtio'/> - <b><backend tap='/dev/net/tun' vhost='/dev/vhost-net'/></b> - <driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5'/> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet1'/> + <model type='virtio'/> + <b><backend tap='/dev/net/tun' vhost='/dev/vhost-net'/></b> + <driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5'/> + </interface> +</devices> +...</pre> <p> For tuning the backend of the network, the <code>backend</code> element @@ -4899,14 +4899,14 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementsNICSTargetOverride">Overriding the target element</a></h5> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <b><target dev='vnet1'/></b> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <b><target dev='vnet1'/></b> + </interface> +</devices> +...</pre> <p> If no target is specified, certain hypervisors will @@ -4925,27 +4925,27 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <b><guest dev='myeth'/></b> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <b><guest dev='myeth'/></b> + </interface> +</devices> +...</pre> <h5><a name="elementsNICSBoot">Specifying boot order</a></h5> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <target dev='vnet1'/> - <b><boot order='1'/></b> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet1'/> + <b><boot order='1'/></b> + </interface> +</devices> +...</pre> <p> For hypervisors which support this, you can set a specific NIC to @@ -4960,15 +4960,15 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementsNICSROM">Interface ROM BIOS configuration</a></h5> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <target dev='vnet1'/> - <b><rom bar='on' file='/etc/fake/boot.bin'/></b> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet1'/> + <b><rom bar='on' file='/etc/fake/boot.bin'/></b> + </interface> +</devices> +...</pre> <p> For hypervisors which support this, you can change how a PCI Network @@ -4988,16 +4988,16 @@ qemu-kvm -net nic,model=? /dev/null </p> <h5><a name="elementDomain">Setting up a network backend in a driver domain</a></h5> <pre> +... +<devices> ... - <devices> - ... - <interface type='bridge'> - <source bridge='br0'/> - <b><backenddomain name='netvm'/></b> - </interface> - ... - </devices> - ...</pre> + <interface type='bridge'> + <source bridge='br0'/> + <b><backenddomain name='netvm'/></b> + </interface> + ... +</devices> +...</pre> <p> The optional <code>backenddomain</code> element allows specifying a @@ -5013,18 +5013,18 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementQoS">Quality of service</a></h5> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <target dev='vnet0'/> - <b><bandwidth> - <inbound average='1000' peak='5000' floor='200' burst='1024'/> - <outbound average='128' peak='256' burst='256'/> - </bandwidth></b> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet0'/> + <b><bandwidth> + <inbound average='1000' peak='5000' floor='200' burst='1024'/> + <outbound average='128' peak='256' burst='256'/> + </bandwidth></b> + </interface> +</devices> +...</pre> <p> This part of interface XML provides setting quality of service. Incoming @@ -5037,26 +5037,26 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementVlanTag">Setting VLAN tag (on supported network types only)</a></h5> <pre> - ... - <devices> - <interface type='bridge'> - <b><vlan></b> - <b><tag id='42'/></b> - <b></vlan></b> - <source bridge='ovsbr0'/> - <virtualport type='openvswitch'> - <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> - </virtualport> - </interface> - <interface type='bridge'> - <b><vlan trunk='yes'></b> - <b><tag id='42'/></b> - <b><tag id='123' nativeMode='untagged'/></b> - <b></vlan></b> - ... - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='bridge'> + <b><vlan></b> + <b><tag id='42'/></b> + <b></vlan></b> + <source bridge='ovsbr0'/> + <virtualport type='openvswitch'> + <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> + </virtualport> + </interface> + <interface type='bridge'> + <b><vlan trunk='yes'></b> + <b><tag id='42'/></b> + <b><tag id='123' nativeMode='untagged'/></b> + <b></vlan></b> + ... + </interface> +</devices> +...</pre> <p> If (and only if) the network connection used by the guest @@ -5104,15 +5104,15 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementLink">Modifying virtual link state</a></h5> <pre> - ... - <devices> - <interface type='network'> - <source network='default'/> - <target dev='vnet0'/> - <b><link state='down'/></b> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet0'/> + <b><link state='down'/></b> + </interface> +</devices> +...</pre> <p> This element provides means of setting state of the virtual network link. @@ -5125,28 +5125,28 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="ipconfig">IP configuration</a></h5> <pre> +... +<devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet0'/> + <b><ip address='192.168.122.5' prefix='24'/></b> + <b><ip address='192.168.122.5' prefix='24' peer='10.0.0.10'/></b> + <b><route family='ipv4' address='192.168.122.0' prefix='24' gateway='192.168.122.1'/></b> + <b><route family='ipv4' address='192.168.122.8' gateway='192.168.122.1'/></b> + </interface> ... - <devices> - <interface type='network'> - <source network='default'/> - <target dev='vnet0'/> - <b><ip address='192.168.122.5' prefix='24'/></b> - <b><ip address='192.168.122.5' prefix='24' peer='10.0.0.10'/></b> - <b><route family='ipv4' address='192.168.122.0' prefix='24' gateway='192.168.122.1'/></b> - <b><route family='ipv4' address='192.168.122.8' gateway='192.168.122.1'/></b> - </interface> - ... - <hostdev mode='capabilities' type='net'> - <source> - <interface>eth0</interface> - </source> - <b><ip address='192.168.122.6' prefix='24'/></b> - <b><route family='ipv4' address='192.168.122.0' prefix='24' gateway='192.168.122.1'/></b> - <b><route family='ipv4' address='192.168.122.8' gateway='192.168.122.1'/></b> - </hostdev> + <hostdev mode='capabilities' type='net'> + <source> + <interface>eth0</interface> + </source> + <b><ip address='192.168.122.6' prefix='24'/></b> + <b><route family='ipv4' address='192.168.122.0' prefix='24' gateway='192.168.122.1'/></b> + <b><route family='ipv4' address='192.168.122.8' gateway='192.168.122.1'/></b> + </hostdev> - </devices> - ... +</devices> +... </pre> <p> @@ -5177,19 +5177,19 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <interface type='ethernet'> - <b><source/></b> - <b><ip address='192.168.123.1' prefix='24'/></b> - <b><ip address='10.0.0.10' prefix='24' peer='192.168.122.5'/></b> - <b><route family='ipv4' address='192.168.42.0' prefix='24' gateway='192.168.123.4'/></b> - <b><source/></b> - ... - </interface> +... +<devices> + <interface type='ethernet'> + <b><source/></b> + <b><ip address='192.168.123.1' prefix='24'/></b> + <b><ip address='10.0.0.10' prefix='24' peer='192.168.122.5'/></b> + <b><route family='ipv4' address='192.168.42.0' prefix='24' gateway='192.168.123.4'/></b> + <b><source/></b> ... - </devices> + </interface> ... +</devices> +... </pre> <p> @@ -5212,21 +5212,21 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <interface type='vhostuser'> - <mac address='52:54:00:3b:83:1a'/> - <source type='unix' path='/tmp/vhost1.sock' mode='server'/> - <model type='virtio'/> - </interface> - <interface type='vhostuser'> - <mac address='52:54:00:3b:83:1b'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> - <model type='virtio'/> - <driver queues='5'/> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='vhostuser'> + <mac address='52:54:00:3b:83:1a'/> + <source type='unix' path='/tmp/vhost1.sock' mode='server'/> + <model type='virtio'/> + </interface> + <interface type='vhostuser'> + <mac address='52:54:00:3b:83:1b'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <model type='virtio'/> + <driver queues='5'/> + </interface> +</devices> +...</pre> <p> The <code><source></code> element has to be specified @@ -5251,23 +5251,23 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <interface ...> +... +<devices> + <interface ...> + ... + <filterref filter='clean-traffic'/> + </interface> + <interface ...> + ... + <filterref filter='myfilter'> + <parameter name='IP' value='104.207.129.11'/> + <parameter name='IP6_ADDR' value='2001:19f0:300:2102::'/> + <parameter name='IP6_MASK' value='64'/> ... - <filterref filter='clean-traffic'/> - </interface> - <interface ...> - ... - <filterref filter='myfilter'> - <parameter name='IP' value='104.207.129.11'/> - <parameter name='IP6_ADDR' value='2001:19f0:300:2102::'/> - <parameter name='IP6_MASK' value='64'/> - ... - </filterref> - </interface> - </devices> - ...</pre> + </filterref> + </interface> +</devices> +...</pre> <p> The <code>filter</code> attribute specifies the name of the nwfilter @@ -5290,18 +5290,18 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <input type='mouse' bus='usb'/> - <input type='keyboard' bus='usb'/> - <input type='mouse' bus='virtio'/> - <input type='keyboard' bus='virtio'/> - <input type='tablet' bus='virtio'/> - <input type='passthrough' bus='virtio'> - <source evdev='/dev/input/event1/> - </input> - </devices> - ...</pre> +... +<devices> + <input type='mouse' bus='usb'/> + <input type='keyboard' bus='usb'/> + <input type='mouse' bus='virtio'/> + <input type='keyboard' bus='virtio'/> + <input type='tablet' bus='virtio'/> + <input type='passthrough' bus='virtio'> + <source evdev='/dev/input/event1/> + </input> +</devices> +...</pre> <dl> <dt><code>input</code></dt> @@ -5336,11 +5336,11 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <hub type='usb'/> - </devices> - ...</pre> +... +<devices> + <hub type='usb'/> +</devices> +...</pre> <dl> <dt><code>hub</code></dt> @@ -5366,19 +5366,19 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <graphics type='sdl' display=':0.0'/> - <graphics type='vnc' port='5904' sharePolicy='allow-exclusive'> - <listen type='address' address='1.2.3.4'/> - </graphics> - <graphics type='rdp' autoport='yes' multiUser='yes' /> - <graphics type='desktop' fullscreen='yes'/> - <graphics type='spice'> - <listen type='network' network='rednet'/> - </graphics> - </devices> - ...</pre> +... +<devices> + <graphics type='sdl' display=':0.0'/> + <graphics type='vnc' port='5904' sharePolicy='allow-exclusive'> + <listen type='address' address='1.2.3.4'/> + </graphics> + <graphics type='rdp' autoport='yes' multiUser='yes' /> + <graphics type='desktop' fullscreen='yes'/> + <graphics type='spice'> + <listen type='network' network='rednet'/> + </graphics> +</devices> +...</pre> <dl> <dt><code>graphics</code></dt> @@ -5488,16 +5488,16 @@ qemu-kvm -net nic,model=? /dev/null and <code>usbredir</code> (<span class="since">since 0.9.12</span>). </p> <pre> - <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'> - <channel name='main' mode='secure'/> - <channel name='record' mode='insecure'/> - <image compression='auto_glz'/> - <streaming mode='filter'/> - <clipboard copypaste='no'/> - <mouse mode='client'/> - <filetransfer enable='no'/> - <gl enable='yes'/> - </graphics></pre> +<graphics type='spice' port='-1' tlsPort='-1' autoport='yes'> + <channel name='main' mode='secure'/> + <channel name='record' mode='insecure'/> + <image compression='auto_glz'/> + <streaming mode='filter'/> + <clipboard copypaste='no'/> + <mouse mode='client'/> + <filetransfer enable='no'/> + <gl enable='yes'/> +</graphics></pre> <p> Spice supports variable compression settings for audio, images and streaming. These settings are accessible via the <code>compression @@ -5652,15 +5652,15 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <video> - <model type='vga' vram='16384' heads='1'> - <acceleration accel3d='yes' accel2d='yes'/> - </model> - </video> - </devices> - ...</pre> +... +<devices> + <video> + <model type='vga' vram='16384' heads='1'> + <acceleration accel3d='yes' accel2d='yes'/> + </model> + </video> +</devices> +...</pre> <dl> <dt><code>video</code></dt> @@ -5750,32 +5750,32 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <parallel type='pty'> - <source path='/dev/pts/2'/> - <target port='0'/> - </parallel> - <serial type='pty'> - <source path='/dev/pts/3'/> - <target port='0'/> - </serial> - <serial type='file'> - <source path='/tmp/file' append='on'> - <seclabel model='dac' relabel='no'/> - </source> - <target port='0'/> - </serial> - <console type='pty'> - <source path='/dev/pts/4'/> - <target port='0'/> - </console> - <channel type='unix'> - <source mode='bind' path='/tmp/guestfwd'/> - <target type='guestfwd' address='10.0.2.1' port='4600'/> - </channel> - </devices> - ...</pre> +... +<devices> + <parallel type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + </parallel> + <serial type='pty'> + <source path='/dev/pts/3'/> + <target port='0'/> + </serial> + <serial type='file'> + <source path='/tmp/file' append='on'> + <seclabel model='dac' relabel='no'/> + </source> + <target port='0'/> + </serial> + <console type='pty'> + <source path='/dev/pts/4'/> + <target port='0'/> + </console> + <channel type='unix'> + <source mode='bind' path='/tmp/guestfwd'/> + <target type='guestfwd' address='10.0.2.1' port='4600'/> + </channel> +</devices> +...</pre> <p> In each of these directives, the top-level element name (parallel, serial, @@ -5815,9 +5815,9 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <log file="/var/log/libvirt/qemu/guestname-serial0.log" append="off"/> - ...</pre> +... +<log file="/var/log/libvirt/qemu/guestname-serial0.log" append="off"/> +...</pre> <p> Each character device element has an optional @@ -5837,14 +5837,14 @@ qemu-kvm -net nic,model=? /dev/null <h6><a name="elementCharParallel">Parallel port</a></h6> <pre> - ... - <devices> - <parallel type='pty'> - <source path='/dev/pts/2'/> - <target port='0'/> - </parallel> - </devices> - ...</pre> +... +<devices> + <parallel type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + </parallel> +</devices> +...</pre> <p> <code>target</code> can have a <code>port</code> attribute, which @@ -5855,14 +5855,14 @@ qemu-kvm -net nic,model=? /dev/null <h6><a name="elementCharSerial">Serial port</a></h6> <pre> - ... - <devices> - <serial type='pty'> - <source path='/dev/pts/3'/> - <target port='0'/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type='pty'> + <source path='/dev/pts/3'/> + <target port='0'/> + </serial> +</devices> +...</pre> <p> <code>target</code> can have a <code>port</code> attribute, which @@ -5921,31 +5921,31 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <console type='pty'> - <source path='/dev/pts/4'/> - <target port='0'/> - </console> +... +<devices> + <console type='pty'> + <source path='/dev/pts/4'/> + <target port='0'/> + </console> - <!-- KVM virtio console --> - <console type='pty'> - <source path='/dev/pts/5'/> - <target type='virtio' port='0'/> - </console> - </devices> - ...</pre> + <!-- KVM virtio console --> + <console type='pty'> + <source path='/dev/pts/5'/> + <target type='virtio' port='0'/> + </console> +</devices> +...</pre> <pre> - ... - <devices> - <!-- KVM S390 sclp console --> - <console type='pty'> - <source path='/dev/pts/1'/> - <target type='sclp' port='0'/> - </console> - </devices> - ...</pre> +... +<devices> + <!-- KVM S390 sclp console --> + <console type='pty'> + <source path='/dev/pts/1'/> + <target type='sclp' port='0'/> + </console> +</devices> +...</pre> <p> If the console is presented as a serial port, the <code>target</code> @@ -5961,26 +5961,26 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <channel type='unix'> - <source mode='bind' path='/tmp/guestfwd'/> - <target type='guestfwd' address='10.0.2.1' port='4600'/> - </channel> +... +<devices> + <channel type='unix'> + <source mode='bind' path='/tmp/guestfwd'/> + <target type='guestfwd' address='10.0.2.1' port='4600'/> + </channel> - <!-- KVM virtio channel --> - <channel type='pty'> - <target type='virtio' name='arbitrary.virtio.serial.port.name'/> - </channel> - <channel type='unix'> - <source mode='bind' path='/var/lib/libvirt/qemu/f16x86_64.agent'/> - <target type='virtio' name='org.qemu.guest_agent.0' state='connected'/> - </channel> - <channel type='spicevmc'> - <target type='virtio' name='com.redhat.spice.0'/> - </channel> - </devices> - ...</pre> + <!-- KVM virtio channel --> + <channel type='pty'> + <target type='virtio' name='arbitrary.virtio.serial.port.name'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/var/lib/libvirt/qemu/f16x86_64.agent'/> + <target type='virtio' name='org.qemu.guest_agent.0' state='connected'/> + </channel> + <channel type='spicevmc'> + <target type='virtio' name='com.redhat.spice.0'/> + </channel> +</devices> +...</pre> <p> This can be implemented in a variety of ways. The specific type of @@ -6060,13 +6060,13 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <console type='stdio'> - <target port='1'/> - </console> - </devices> - ...</pre> +... +<devices> + <console type='stdio'> + <target port='1'/> + </console> +</devices> +...</pre> <h6><a name="elementsCharFle">Device logfile</a></h6> @@ -6077,14 +6077,14 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type="file"> - <source path="/var/log/vm/vm-serial.log"/> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="file"> + <source path="/var/log/vm/vm-serial.log"/> + <target port="1"/> + </serial> +</devices> +...</pre> <h6><a name="elementsCharVC">Virtual console</a></h6> @@ -6095,13 +6095,13 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type='vc'> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type='vc'> + <target port="1"/> + </serial> +</devices> +...</pre> <h6><a name="elementsCharNull">Null device</a></h6> @@ -6111,13 +6111,13 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type='null'> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type='null'> + <target port="1"/> + </serial> +</devices> +...</pre> <h6><a name="elementsCharPTY">Pseudo TTY</a></h6> @@ -6128,14 +6128,14 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type="pty"> - <source path="/dev/pts/3"/> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="pty"> + <source path="/dev/pts/3"/> + <target port="1"/> + </serial> +</devices> +...</pre> <p> NB special case if <console type='pty'>, then the TTY @@ -6155,14 +6155,14 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type="dev"> - <source path="/dev/ttyS0"/> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="dev"> + <source path="/dev/ttyS0"/> + <target port="1"/> + </serial> +</devices> +...</pre> <h6><a name="elementsCharPipe">Named pipe</a></h6> @@ -6172,14 +6172,14 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type="pipe"> - <source path="/tmp/mypipe"/> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="pipe"> + <source path="/tmp/mypipe"/> + <target port="1"/> + </serial> +</devices> +...</pre> <h6><a name="elementsCharTCP">TCP client/server</a></h6> @@ -6189,30 +6189,30 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type="tcp"> - <source mode="connect" host="0.0.0.0" service="2445"/> - <protocol type="raw"/> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="tcp"> + <source mode="connect" host="0.0.0.0" service="2445"/> + <protocol type="raw"/> + <target port="1"/> + </serial> +</devices> + ...</pre> <p> Or as a TCP server waiting for a client connection. </p> <pre> - ... - <devices> - <serial type="tcp"> - <source mode="bind" host="127.0.0.1" service="2445"/> - <protocol type="raw"/> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="tcp"> + <source mode="bind" host="127.0.0.1" service="2445"/> + <protocol type="raw"/> + <target port="1"/> + </serial> +</devices> +...</pre> <p> Alternatively you can use <code>telnet</code> instead @@ -6226,21 +6226,21 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> +... +<devices> + <serial type="tcp"> + <source mode="connect" host="0.0.0.0" service="2445"/> + <protocol type="telnet"/> + <target port="1"/> + </serial> ... - <devices> - <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> - </devices> - ...</pre> + <serial type="tcp"> + <source mode="bind" host="127.0.0.1" service="2445"/> + <protocol type="telnet"/> + <target port="1"/> + </serial> +</devices> +...</pre> <p> <span class="since">Since 2.4.0,</span> the optional attribute @@ -6260,15 +6260,15 @@ qemu-kvm -net nic,model=? /dev/null or <code>default_tls_x509_cert_dir</code> TLS directory structure exists. </p> <pre> - ... - <devices> - <serial type="tcp"> - <source mode='connect' host="127.0.0.1" service="5555" tls="yes"/> - <protocol type="raw"/> - <target port="0"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="tcp"> + <source mode='connect' host="127.0.0.1" service="5555" tls="yes"/> + <protocol type="raw"/> + <target port="0"/> + </serial> +</devices> +...</pre> <h6><a name="elementsCharUDP">UDP network console</a></h6> @@ -6278,15 +6278,15 @@ qemu-kvm -net nic,model=? /dev/null </p> <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> - </devices> - ...</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> +</devices> +...</pre> <h6><a name="elementsCharUNIX">UNIX domain socket client/server</a></h6> @@ -6296,14 +6296,14 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type="unix"> - <source mode="bind" path="/tmp/foo"/> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="unix"> + <source mode="bind" path="/tmp/foo"/> + <target port="1"/> + </serial> +</devices> +...</pre> <h6><a name="elementsCharSpiceport">Spice channel</a></h6> @@ -6319,14 +6319,14 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type="spiceport"> - <source channel="org.qemu.console.serial.0"/> - <target port="1"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="spiceport"> + <source channel="org.qemu.console.serial.0"/> + <target port="1"/> + </serial> +</devices> +...</pre> <h6><a name="elementsNmdm">Nmdm device</a></h6> @@ -6337,13 +6337,13 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <serial type="nmdm"> - <source master="/dev/nmdm0A" slave="/dev/nmdm0B"/> - </serial> - </devices> - ...</pre> +... +<devices> + <serial type="nmdm"> + <source master="/dev/nmdm0A" slave="/dev/nmdm0B"/> + </serial> +</devices> +...</pre> <p> The <code>source</code> element has these attributes: @@ -6367,11 +6367,11 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <sound model='es1370'/> - </devices> - ...</pre> +... +<devices> + <sound model='es1370'/> +</devices> +...</pre> <dl> <dt><code>sound</code></dt> @@ -6397,13 +6397,13 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <sound model='ich6'> - <codec type='micro'/> - </sound> - </devices> - ...</pre> +... +<devices> + <sound model='ich6'> + <codec type='micro'/> + </sound> +</devices> +...</pre> <p> Each <code>sound</code> element has an optional @@ -6433,11 +6433,11 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <watchdog model='i6300esb'/> - </devices> - ...</pre> +... +<devices> + <watchdog model='i6300esb'/> +</devices> +...</pre> <pre> ... @@ -6520,11 +6520,11 @@ qemu-kvm -net nic,model=? /dev/null Example: automatically added device with KVM </p> <pre> - ... - <devices> - <memballoon model='virtio'/> - </devices> - ...</pre> +... +<devices> + <memballoon model='virtio'/> +</devices> +...</pre> <p> Example: manually added device with static PCI slot 2 requested @@ -6592,19 +6592,19 @@ qemu-kvm -net nic,model=? /dev/null Example: usage of the RNG device: </p> <pre> - ... - <devices> - <rng model='virtio'> - <rate period="2000" bytes="1234"/> - <backend model='random'>/dev/random</backend> - <!-- OR --> - <backend model='egd' type='udp'> - <source mode='bind' service='1234'/> - <source mode='connect' host='1.2.3.4' service='1234'/> - </backend> - </rng> - </devices> - ... +... +<devices> + <rng model='virtio'> + <rate period="2000" bytes="1234"/> + <backend model='random'>/dev/random</backend> + <!-- OR --> + <backend model='egd' type='udp'> + <source mode='bind' service='1234'/> + <source mode='connect' host='1.2.3.4' service='1234'/> + </backend> + </rng> +</devices> +... </pre> <dl> <dt><code>model</code></dt> @@ -6680,15 +6680,15 @@ qemu-kvm -net nic,model=? /dev/null Example: usage of the TPM passthrough device </p> <pre> - ... - <devices> - <tpm model='tpm-tis'> - <backend type='passthrough'> - <device path='/dev/tpm0'/> - </backend> - </tpm> - </devices> - ... +... +<devices> + <tpm model='tpm-tis'> + <backend type='passthrough'> + <device path='/dev/tpm0'/> + </backend> + </tpm> +</devices> +... </pre> <dl> <dt><code>model</code></dt> @@ -6734,13 +6734,13 @@ qemu-kvm -net nic,model=? /dev/null Example: usage of NVRAM configuration </p> <pre> - ... - <devices> - <nvram> - <address type='spapr-vio' reg='0x3000'/> - </nvram> - </devices> - ... +... +<devices> + <nvram> + <address type='spapr-vio' reg='0x3000'/> + </nvram> +</devices> +... </pre> <dl> <dt><code>spapr-vio</code></dt> @@ -6778,14 +6778,14 @@ qemu-kvm -net nic,model=? /dev/null Example: usage of panic configuration </p> <pre> - ... - <devices> - <panic model='hyperv'/> - <panic model='isa'> - <address type='isa' iobase='0x505'/> - </panic> - </devices> - ... +... +<devices> + <panic model='hyperv'/> + <panic model='isa'> + <address type='isa' iobase='0x505'/> + </panic> +</devices> +... </pre> <dl> <dt><code>model</code></dt> @@ -6823,20 +6823,20 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - ... - <devices> - <shmem name='my_shmem0'> - <model type='ivshmem-plain'/> - <size unit='M'>4</size> - </shmem> - <shmem name='shmem_server'> - <model type='ivshmem-doorbell'/> - <size unit='M'>2</size> - <server path='/tmp/socket-shmem'/> - <msi vectors='32' ioeventfd='on'/> - </shmem> - </devices> - ... +... +<devices> + <shmem name='my_shmem0'> + <model type='ivshmem-plain'/> + <size unit='M'>4</size> + </shmem> + <shmem name='shmem_server'> + <model type='ivshmem-doorbell'/> + <size unit='M'>2</size> + <server path='/tmp/socket-shmem'/> + <msi vectors='32' ioeventfd='on'/> + </shmem> +</devices> +... </pre> <dl> @@ -6896,26 +6896,26 @@ qemu-kvm -net nic,model=? /dev/null Example: usage of the memory devices </p> <pre> - ... - <devices> - <memory model='dimm'> - <target> - <size unit='KiB'>524287</size> - <node>0</node> - </target> - </memory> - <memory model='dimm'> - <source> - <pagesize unit='KiB'>4096</pagesize> - <nodemask>1-3</nodemask> - </source> - <target> - <size unit='KiB'>524287</size> - <node>1</node> - </target> - </memory> - </devices> - ... +... +<devices> + <memory model='dimm'> + <target> + <size unit='KiB'>524287</size> + <node>0</node> + </target> + </memory> + <memory model='dimm'> + <source> + <pagesize unit='KiB'>4096</pagesize> + <nodemask>1-3</nodemask> + </source> + <target> + <size unit='KiB'>524287</size> + <node>1</node> + </target> + </memory> +</devices> +... </pre> <dl> <dt><code>model</code></dt> @@ -6975,11 +6975,11 @@ qemu-kvm -net nic,model=? /dev/null Example: </p> <pre> - ... - <devices> - <iommu model='intel'/> - </devices> - ... +... +<devices> + <iommu model='intel'/> +</devices> +... </pre> <dl> <dt><code>model</code></dt> @@ -7021,21 +7021,21 @@ qemu-kvm -net nic,model=? /dev/null </p> <pre> - <seclabel type='dynamic' model='selinux'/> +<seclabel type='dynamic' model='selinux'/> - <seclabel type='dynamic' model='selinux'> - <baselabel>system_u:system_r:my_svirt_t:s0</baselabel> - </seclabel> +<seclabel type='dynamic' model='selinux'> + <baselabel>system_u:system_r:my_svirt_t:s0</baselabel> +</seclabel> - <seclabel type='static' model='selinux' relabel='no'> - <label>system_u:system_r:svirt_t:s0:c392,c662</label> - </seclabel> +<seclabel type='static' model='selinux' relabel='no'> + <label>system_u:system_r:svirt_t:s0:c392,c662</label> +</seclabel> - <seclabel type='static' model='selinux' relabel='yes'> - <label>system_u:system_r:svirt_t:s0:c392,c662</label> - </seclabel> +<seclabel type='static' model='selinux' relabel='yes'> + <label>system_u:system_r:svirt_t:s0:c392,c662</label> +</seclabel> - <seclabel type='none'/> +<seclabel type='none'/> </pre> <p> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/formatnetwork.html.in | 320 ++++++++++++++++++++++----------------------- 1 file changed, 160 insertions(+), 160 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 13ca32d..4fc779c 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -35,14 +35,14 @@ </p> <pre> - <network ipv6='yes' trustGuestRxFilters='no'> - <name>default</name> - <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid> - <metadata> - <app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo>; - <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar>; - </metadata> - ...</pre> +<network ipv6='yes' trustGuestRxFilters='no'> + <name>default</name> + <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid> + <metadata> + <app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo>; + <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar>; + </metadata> + ...</pre> <dl> <dt><code>name</code></dt> @@ -91,11 +91,11 @@ </p> <pre> - ... - <bridge name="virbr0" stp="on" delay="5" macTableManager="libvirt"/> - <domain name="example.com" localOnly="no"/> - <forward mode="nat" dev="eth0"/> - ...</pre> +... +<bridge name="virbr0" stp="on" delay="5" macTableManager="libvirt"/> +<domain name="example.com" localOnly="no"/> +<forward mode="nat" dev="eth0"/> +...</pre> <dl> <dt><code>bridge</code></dt> @@ -815,18 +815,18 @@ </p> <pre> - ... - <ip address="192.168.122.1" netmask="255.255.255.0"> - <dhcp> - <range start="192.168.122.128" end="192.168.122.254" /> - </dhcp> - </ip> - <route address="192.168.222.0" prefix="24" gateway="192.168.122.2" /> - <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> - <route family="ipv6" address="2001:db8:ca2:3::" prefix="64" gateway="2001:db8:ca2:2::2"/> - <route family="ipv6" address="2001:db9:4:1::" prefix="64" gateway="2001:db8:ca2:2::3" metric='2'> - </route> - ... +... + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.128" end="192.168.122.254" /> + </dhcp> + </ip> + <route address="192.168.222.0" prefix="24" gateway="192.168.122.2" /> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> + <route family="ipv6" address="2001:db8:ca2:3::" prefix="64" gateway="2001:db8:ca2:2::2"/> + <route family="ipv6" address="2001:db9:4:1::" prefix="64" gateway="2001:db8:ca2:2::3" metric='2'> + </route> +... </pre> <h3><a name="elementsAddress">Addressing</a></h3> @@ -841,30 +841,30 @@ </p> <pre> - ... - <mac address='00:16:3E:5D:C7:9E'/> - <domain name="example.com"/> - <dns> - <txt name="example" value="example value" /> - <forwarder addr="8.8.8.8"/> - <forwarder domain='example.com' addr="8.8.4.4"/> - <forwarder domain='www.example.com'/> - <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> - <host ip='192.168.122.2'> - <hostname>myhost</hostname> - <hostname>myhostalias</hostname> - </host> - </dns> - <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" /> - </dhcp> - </ip> - <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> - <route family="ipv6" address="2001:db9:ca1:1::" prefix="64" gateway="2001:db8:ca2:2::2" /> - </network></pre> +... +<mac address='00:16:3E:5D:C7:9E'/> +<domain name="example.com"/> +<dns> + <txt name="example" value="example value" /> + <forwarder addr="8.8.8.8"/> + <forwarder domain='example.com' addr="8.8.4.4"/> + <forwarder domain='www.example.com'/> + <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> + <host ip='192.168.122.2'> + <hostname>myhost</hostname> + <hostname>myhostalias</hostname> + </host> +</dns> +<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" /> + </dhcp> +</ip> +<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> +<route family="ipv6" address="2001:db9:ca1:1::" prefix="64" gateway="2001:db8:ca2:2::2" /> +</pre> <dl> <dt><code>mac</code></dt> @@ -1074,17 +1074,17 @@ </p> <pre> - <network> - <name>default</name> - <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" /> - </dhcp> - </ip> - <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> - </network></pre> +<network> + <name>default</name> + <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" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> +</network></pre> <p> @@ -1093,21 +1093,21 @@ </p> <pre> - <network> - <name>default6</name> - <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" /> - </dhcp> - </ip> - <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" > - <dhcp> - <range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" /> - </dhcp> - </ip> - </network></pre> +<network> + <name>default6</name> + <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" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" > + <dhcp> + <range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" /> + </dhcp> + </ip> +</network></pre> <h3><a name="examplesRoute">Routed network config</a></h3> @@ -1121,17 +1121,17 @@ </p> <pre> - <network> - <name>local</name> - <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" /> - </dhcp> - </ip> - <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> - </network></pre> +<network> + <name>local</name> + <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" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> +</network></pre> <p> Below is another IPv6 variation. Instead of a dhcp range being @@ -1144,24 +1144,24 @@ </p> <pre> - <network> - <name>local6</name> - <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" /> - </dhcp> - </ip> - <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" > - <dhcp> - <host name="paul" ip="2001:db8:ca2:2:3::1" /> - <host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66" ip="2001:db8:ca2:2:3::2" /> - <host id="0:3:0:1:0:16:3e:11:22:33" name="ralph" ip="2001:db8:ca2:2:3::3" /> - <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="badbob" ip="2001:db8:ca2:2:3::4" /> - </dhcp> - </ip> - </network></pre> +<network> + <name>local6</name> + <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" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" > + <dhcp> + <host name="paul" ip="2001:db8:ca2:2:3::1" /> + <host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66" ip="2001:db8:ca2:2:3::2" /> + <host id="0:3:0:1:0:16:3e:11:22:33" name="ralph" ip="2001:db8:ca2:2:3::3" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="badbob" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> +</network></pre> <p> Below is yet another IPv6 variation. This variation has only @@ -1176,19 +1176,19 @@ </p> <pre> - <network> - <name>net7</name> - <bridge name="virbr7" /> - <forward mode="route"/> - <ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" > - <dhcp> - <range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" /> - <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" /> - </dhcp> - </ip> - <route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" > - </route> - </network></pre> +<network> + <name>net7</name> + <bridge name="virbr7" /> + <forward mode="route"/> + <ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" > + <dhcp> + <range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> + <route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" > + </route> +</network></pre> <h3><a name="examplesPrivate">Isolated network config</a></h3> @@ -1201,16 +1201,16 @@ </p> <pre> - <network> - <name>private</name> - <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" /> - </dhcp> - </ip> - <ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" /> - </network></pre> +<network> + <name>private</name> + <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" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" /> +</network></pre> <h3><a name="examplesPrivate6">Isolated IPv6 network config</a></h3> @@ -1224,18 +1224,18 @@ </p> <pre> - <network> - <name>sixnet</name> - <bridge name="virbr6" /> - <ip family="ipv6" address="2001:db8:ca2:6::1" prefix="64" > - <dhcp> - <host name="peter" ip="2001:db8:ca2:6:6::1" /> - <host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66" ip="2001:db8:ca2:6:6::2" /> - <host id="0:3:0:1:0:16:3e:11:22:33" name="dariusz" ip="2001:db8:ca2:6:6::3" /> - <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="anita" ip="2001:db8:ca2:6:6::4" /> - </dhcp> - </ip> - </network></pre> +<network> + <name>sixnet</name> + <bridge name="virbr6" /> + <ip family="ipv6" address="2001:db8:ca2:6::1" prefix="64" > + <dhcp> + <host name="peter" ip="2001:db8:ca2:6:6::1" /> + <host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66" ip="2001:db8:ca2:6:6::2" /> + <host id="0:3:0:1:0:16:3e:11:22:33" name="dariusz" ip="2001:db8:ca2:6:6::3" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="anita" ip="2001:db8:ca2:6:6::4" /> + </dhcp> + </ip> +</network></pre> <h3><a name="examplesBridge">Using an existing host bridge</a></h3> @@ -1249,11 +1249,11 @@ </p> <pre> - <network> - <name>host-bridge</name> - <forward mode="bridge"/> - <bridge name="br0"/> - </network></pre> +<network> + <name>host-bridge</name> + <forward mode="bridge"/> + <bridge name="br0"/> +</network></pre> <h3><a name="examplesDirect">Using a macvtap "direct" connection</a></h3> @@ -1279,16 +1279,16 @@ </p> <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> - </network></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> +</network></pre> <h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3> @@ -1303,12 +1303,12 @@ </p> <pre> - <network ipv6='yes'> - <name>nogw</name> - <uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid> - <bridge name="virbr2" stp="on" delay="0" /> - <mac address='00:16:3E:5D:C7:9E'/> - </network></pre> +<network ipv6='yes'> + <name>nogw</name> + <uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid> + <bridge name="virbr2" stp="on" delay="0" /> + <mac address='00:16:3E:5D:C7:9E'/> +</network></pre> </body> </html> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/formatnwfilter.html.in | 210 ++++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 93db5b0..7ea69b5 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -61,14 +61,14 @@ the filter <code>clean-traffic</code>. </p> <pre> - ... - <devices> - <interface type='bridge'> - <mac address='00:16:3e:5d:c7:9e'/> - <filterref filter='clean-traffic'/> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='bridge'> + <mac address='00:16:3e:5d:c7:9e'/> + <filterref filter='clean-traffic'/> + </interface> +</devices> +...</pre> <p> Network filters are written in XML and may either contain references @@ -91,16 +91,16 @@ the parameter <code>IP</code> and a dotted IP address as value. </p> <pre> - ... - <devices> - <interface type='bridge'> - <mac address='00:16:3e:5d:c7:9e'/> - <filterref filter='clean-traffic'> - <parameter name='IP' value='10.0.0.1'/> - </filterref> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='bridge'> + <mac address='00:16:3e:5d:c7:9e'/> + <filterref filter='clean-traffic'> + <parameter name='IP' value='10.0.0.1'/> + </filterref> + </interface> +</devices> +...</pre> <p> In this particular example, the <code>clean-traffic</code> network @@ -285,18 +285,18 @@ providing multiple elements for the IP variable is: </p> <pre> - ... - <devices> - <interface type='bridge'> - <mac address='00:16:3e:5d:c7:9e'/> - <filterref filter='clean-traffic'> - <parameter name='IP' value='10.0.0.1'/> - <parameter name='IP' value='10.0.0.2'/> - <parameter name='IP' value='10.0.0.3'/> - </filterref> - </interface> - </devices> - ...</pre> +... +<devices> + <interface type='bridge'> + <mac address='00:16:3e:5d:c7:9e'/> + <filterref filter='clean-traffic'> + <parameter name='IP' value='10.0.0.1'/> + <parameter name='IP' value='10.0.0.2'/> + <parameter name='IP' value='10.0.0.3'/> + </filterref> + </interface> +</devices> +...</pre> <p> This then allows filters to enable multiple IP addresses per interface. Therefore, with the list @@ -304,11 +304,11 @@ individual filtering rules, one for each IP address. </p> <pre> - ... - <rule action='accept' direction='in' priority='500'> - <tcp srpipaddr='$IP'/> - </rule> - ... +... +<rule action='accept' direction='in' priority='500'> + <tcp srpipaddr='$IP'/> +</rule> +... </pre> <p> <span class="since">Since 0.9.10</span> it is possible to access @@ -317,11 +317,11 @@ of the variable DSTPORTS. </p> <pre> - ... - <rule action='accept' direction='in' priority='500'> - <udp dstportstart='$DSTPORTS[1]'/> - </rule> - ... +... +<rule action='accept' direction='in' priority='500'> + <udp dstportstart='$DSTPORTS[1]'/> +</rule> +... </pre> <p> <span class="since">Since 0.9.10</span> it is possible to create @@ -336,29 +336,29 @@ iterators to access their elements. </p> <pre> - ... - <rule action='accept' direction='in' priority='500'> - <ip srcipaddr='$SRCIPADDRESSES[@1]' dstportstart='$DSTPORTS[@2]'/> - </rule> - ... +... +<rule action='accept' direction='in' priority='500'> + <ip srcipaddr='$SRCIPADDRESSES[@1]' dstportstart='$DSTPORTS[@2]'/> +</rule> +... </pre> <p> In an example we assign concrete values to SRCIPADDRESSES and DSTPORTS </p> <pre> - SRCIPADDRESSES = [ 10.0.0.1, 11.1.2.3 ] - DSTPORTS = [ 80, 8080 ] +SRCIPADDRESSES = [ 10.0.0.1, 11.1.2.3 ] +DSTPORTS = [ 80, 8080 ] </pre> <p> Accessing the variables using $SRCIPADDRESSES[@1] and $DSTPORTS[@2] would then result in all combinations of addresses and ports being created: </p> <pre> - 10.0.0.1, 80 - 10.0.0.1, 8080 - 11.1.2.3, 80 - 11.1.2.3, 8080 +10.0.0.1, 80 +10.0.0.1, 8080 +11.1.2.3, 80 +11.1.2.3, 8080 </pre> <p> Accessing the same variables using a single iterator, for example by using @@ -366,8 +366,8 @@ parallel access to both lists and result in the following combinations: </p> <pre> - 10.0.0.1, 80 - 11.1.2.3, 8080 +10.0.0.1, 80 +11.1.2.3, 8080 </pre> <p> Further, the notation of $VARIABLE is short-hand for $VARIABLE[@0]. The @@ -440,12 +440,12 @@ using the DHCP snooping method: </p> <pre> - <interface type='bridge'> - <source bridge='virbr0'/> - <filterref filter='clean-traffic'> - <parameter name='CTRL_IP_LEARNING' value='dhcp'/> - </filterref> - </interface> +<interface type='bridge'> + <source bridge='virbr0'/> + <filterref filter='clean-traffic'> + <parameter name='CTRL_IP_LEARNING' value='dhcp'/> + </filterref> +</interface> </pre> <h3><a name="nwfelemsReservedVars">Reserved Variables</a></h3> @@ -658,10 +658,10 @@ </p> <pre> [...] - <rule action='drop' direction='in'> - <protocol match='no' attribute1='value1' attribute2='value2'/> - <protocol attribute3='value3'/> - </rule> +<rule action='drop' direction='in'> + <protocol match='no' attribute1='value1' attribute2='value2'/> + <protocol attribute3='value3'/> +</rule> [...] </pre> <p> @@ -1896,11 +1896,11 @@ turned off for incoming connections to TCP port 12345. </p> <pre> - [...] - <rule direction='in' action='accept' statematch='false'> - <tcp dstportstart='12345'/> - </rule> - [...] +[...] +<rule direction='in' action='accept' statematch='false'> + <tcp dstportstart='12345'/> +</rule> +[...] </pre> <p> This now allows incoming traffic to TCP port 12345, but would also @@ -1918,26 +1918,26 @@ time, the following XML fragment can be used to achieve this. </p> <pre> - [...] - <rule action='drop' direction='in' priority='400'> - <tcp connlimit-above='1'/> - </rule> - <rule action='accept' direction='in' priority='500'> - <tcp dstportstart='22'/> - </rule> - <rule action='drop' direction='out' priority='400'> - <icmp connlimit-above='1'/> - </rule> - <rule action='accept' direction='out' priority='500'> - <icmp/> - </rule> - <rule action='accept' direction='out' priority='500'> - <udp dstportstart='53'/> - </rule> - <rule action='drop' direction='inout' priority='1000'> - <all/> - </rule> - [...] +[...] +<rule action='drop' direction='in' priority='400'> + <tcp connlimit-above='1'/> +</rule> +<rule action='accept' direction='in' priority='500'> + <tcp dstportstart='22'/> +</rule> +<rule action='drop' direction='out' priority='400'> + <icmp connlimit-above='1'/> +</rule> +<rule action='accept' direction='out' priority='500'> + <icmp/> +</rule> +<rule action='accept' direction='out' priority='500'> + <udp dstportstart='53'/> +</rule> +<rule action='drop' direction='inout' priority='1000'> + <all/> +</rule> +[...] </pre> <p> Note that the rule for the limit has to logically appear @@ -1958,7 +1958,7 @@ </p> <pre> - echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout +echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout </pre> <p> sets the ICMP connection tracking timeout to 3 seconds. The @@ -2201,12 +2201,12 @@ the domain XML of the <code>test</code> VM could then look like this: </p> <pre> - [...] - <interface type='bridge'> - <source bridge='mybridge'/> - <filterref filter='test-eth0'/> - </interface> - [...] +[...] +<interface type='bridge'> + <source bridge='mybridge'/> + <filterref filter='test-eth0'/> +</interface> +[...] </pre> <p> @@ -2216,15 +2216,15 @@ <code>ICMP</code> rule can be replaced with the following two rules: </p> <pre> - <!-- enable outgoing ICMP echo requests--> - <rule action='accept' direction='out'> - <icmp type='8'/> - </rule> +<!-- enable outgoing ICMP echo requests--> +<rule action='accept' direction='out'> + <icmp type='8'/> +</rule> - <!-- enable incoming ICMP echo replies--> - <rule action='accept' direction='in'> - <icmp type='0'/> - </rule> +<!-- enable incoming ICMP echo replies--> +<rule action='accept' direction='in'> + <icmp type='0'/> +</rule> </pre> <h3><a name="nwfwriteexample2nd">Second example custom filter</a></h3> @@ -2326,9 +2326,9 @@ the ftp connection with the VM is established. </p> <pre> - modprobe nf_conntrack_ftp # where available or +modprobe nf_conntrack_ftp # where available or - modprobe ip_conntrack_ftp # if above is not available +modprobe ip_conntrack_ftp # if above is not available </pre> <p> If other protocols than ftp are to be used in conjunction with the -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/formatsecret.html.in | 200 +++++++++++++++++++++++----------------------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/docs/formatsecret.html.in b/docs/formatsecret.html.in index e4bf50f..21b9339 100644 --- a/docs/formatsecret.html.in +++ b/docs/formatsecret.html.in @@ -61,26 +61,26 @@ </p> <pre> - <secret ephemeral='no' private='yes'> - <description>Super secret name of my first puppy</description> - <uuid>0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f</uuid> - <usage type='volume'> - <volume>/var/lib/libvirt/images/puppyname.img</volume> - </usage> - </secret> +<secret ephemeral='no' private='yes'> + <description>Super secret name of my first puppy</description> + <uuid>0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f</uuid> + <usage type='volume'> + <volume>/var/lib/libvirt/images/puppyname.img</volume> + </usage> +</secret> </pre> <p> Define the secret and set the passphrase as follows: </p> <pre> - # virsh secret-define volume-secret.xml - Secret 0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f created - # - # MYSECRET=`printf %s "open sesame" | base64` - # virsh secret-set-value 0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f $MYSECRET - Secret value set - # +# virsh secret-define volume-secret.xml +Secret 0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f created +# +# MYSECRET=`printf %s "open sesame" | base64` +# virsh secret-set-value 0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f $MYSECRET +Secret value set +# </pre> <p> @@ -88,9 +88,9 @@ volume <a href="formatstorageencryption.html">encryption</a> as follows: </p> <pre> - <encryption format='qcow'> - <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> - </encryption> +<encryption format='qcow'> + <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> +</encryption> </pre> <p> @@ -102,22 +102,22 @@ <span class="since">since 2.1.0</span>. An example follows: </p> <pre> - # cat luks-secret.xml - <secret ephemeral='no' private='yes'> - <description>LUKS Sample Secret</description> - <uuid>f52a81b2-424e-490c-823d-6bd4235bc57</uuid> - <usage type='volume'> - <volume>/var/lib/libvirt/images/luks-sample.img</volume> - </usage> - </secret> +# cat luks-secret.xml +<secret ephemeral='no' private='yes'> + <description>LUKS Sample Secret</description> + <uuid>f52a81b2-424e-490c-823d-6bd4235bc57</uuid> + <usage type='volume'> + <volume>/var/lib/libvirt/images/luks-sample.img</volume> + </usage> +</secret> - # virsh secret-define luks-secret.xml - Secret f52a81b2-424e-490c-823d-6bd4235bc57 created - # - # MYSECRET=`printf %s "letmein" | base64` - # virsh secret-set-value f52a81b2-424e-490c-823d-6bd4235bc57 $MYSECRET - Secret value set - # +# virsh secret-define luks-secret.xml +Secret f52a81b2-424e-490c-823d-6bd4235bc57 created +# +# MYSECRET=`printf %s "letmein" | base64` +# virsh secret-set-value f52a81b2-424e-490c-823d-6bd4235bc57 $MYSECRET +Secret value set +# </pre> <h3><a name="CephUsageType">Usage type "ceph"</a></h3> @@ -134,12 +134,12 @@ </p> <pre> - <secret ephemeral='no' private='yes'> - <description>CEPH passphrase example</description> - <usage type='ceph'> - <name>ceph_example</name> - </usage> - </secret> +<secret ephemeral='no' private='yes'> + <description>CEPH passphrase example</description> + <usage type='ceph'> + <name>ceph_example</name> + </usage> +</secret> </pre> <p> @@ -149,19 +149,19 @@ chosen secret pass phrase. </p> <pre> - # virsh secret-define ceph-secret.xml - Secret 1b40a534-8301-45d5-b1aa-11894ebb1735 created - # - # virsh secret-list - UUID Usage - ----------------------------------------------------------- - 1b40a534-8301-45d5-b1aa-11894ebb1735 cephx ceph_example - # - # CEPHPHRASE=`printf %s "pass phrase" | base64` - # virsh secret-set-value 1b40a534-8301-45d5-b1aa-11894ebb1735 $CEPHPHRASE - Secret value set +# virsh secret-define ceph-secret.xml +Secret 1b40a534-8301-45d5-b1aa-11894ebb1735 created +# +# virsh secret-list + UUID Usage +----------------------------------------------------------- + 1b40a534-8301-45d5-b1aa-11894ebb1735 cephx ceph_example +# +# CEPHPHRASE=`printf %s "pass phrase" | base64` +# virsh secret-set-value 1b40a534-8301-45d5-b1aa-11894ebb1735 $CEPHPHRASE +Secret value set - # +# </pre> <p> @@ -171,9 +171,9 @@ element as follows: </p> <pre> - <auth username='myname'> - <secret type='ceph' usage='ceph_example'/> - </auth> +<auth username='myname'> + <secret type='ceph' usage='ceph_example'/> +</auth> </pre> <p> @@ -182,9 +182,9 @@ <code><source></code> element as follows: </p> <pre> - <auth type='ceph' username='myname'> - <secret usage='ceph_example'/> - </auth> +<auth type='ceph' username='myname'> + <secret usage='ceph_example'/> +</auth> </pre> <h3><a name="iSCSIUsageType">Usage type "iscsi"</a></h3> @@ -203,11 +203,11 @@ authentication file: </p> <pre> - <target iqn.2013-07.com.example:iscsi-pool> - backing-store /home/tgtd/iscsi-pool/disk1 - backing-store /home/tgtd/iscsi-pool/disk2 - incominguser myname mysecret - </target> +<target iqn.2013-07.com.example:iscsi-pool> +backing-store /home/tgtd/iscsi-pool/disk1 +backing-store /home/tgtd/iscsi-pool/disk2 +incominguser myname mysecret +</target> </pre> <p> Define an iscsi-secret.xml file to describe the secret. Use the @@ -219,12 +219,12 @@ or disk XML description. </p> <pre> - <secret ephemeral='no' private='yes'> - <description>Passphrase for the iSCSI example.com server</description> - <usage type='iscsi'> - <target>libvirtiscsi</target> - </usage> - </secret> +<secret ephemeral='no' private='yes'> + <description>Passphrase for the iSCSI example.com server</description> + <usage type='iscsi'> + <target>libvirtiscsi</target> + </usage> +</secret> </pre> <p> @@ -235,18 +235,18 @@ used in the iSCSI authentication configuration file. </p> <pre> - # virsh secret-define secret.xml - Secret c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 created +# virsh secret-define secret.xml +Secret c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 created - # virsh secret-list - UUID Usage - ----------------------------------------------------------- - c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 iscsi libvirtiscsi +# virsh secret-list + UUID Usage +----------------------------------------------------------- + c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 iscsi libvirtiscsi - # MYSECRET=`printf %s "mysecret" | base64` - # virsh secret-set-value c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 $MYSECRET - Secret value set - # +# MYSECRET=`printf %s "mysecret" | base64` +# virsh secret-set-value c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 $MYSECRET +Secret value set +# </pre> <p> @@ -256,9 +256,9 @@ element as follows: </p> <pre> - <auth username='myname'> - <secret type='iscsi' usage='libvirtiscsi'/> - </auth> +<auth username='myname'> + <secret type='iscsi' usage='libvirtiscsi'/> +</auth> </pre> <p> @@ -267,9 +267,9 @@ <code><source></code> element as follows: </p> <pre> - <auth type='chap' username='myname'> - <secret usage='libvirtiscsi'/> - </auth> +<auth type='chap' username='myname'> + <secret usage='libvirtiscsi'/> +</auth> </pre> <h3><a name="tlsUsageType">Usage type "tls"</a></h3> @@ -286,22 +286,22 @@ </p> <pre> - # cat tls-secret.xml - <secret ephemeral='no' private='yes'> - <description>sample tls secret</description> - <usage type='tls'> - <name>TLS_example</name> - </usage> - </secret> +# cat tls-secret.xml +<secret ephemeral='no' private='yes'> + <description>sample tls secret</description> + <usage type='tls'> + <name>TLS_example</name> + </usage> +</secret> - # virsh secret-define tls-secret.xml - Secret 718c71bd-67b5-4a2b-87ec-a24e8ca200dc created +# virsh secret-define tls-secret.xml +Secret 718c71bd-67b5-4a2b-87ec-a24e8ca200dc created - # virsh secret-list - UUID Usage - ----------------------------------------------------------- - 718c71bd-67b5-4a2b-87ec-a24e8ca200dc tls TLS_example - # +# virsh secret-list + UUID Usage +----------------------------------------------------------- + 718c71bd-67b5-4a2b-87ec-a24e8ca200dc tls TLS_example +# </pre> @@ -320,9 +320,9 @@ </p> <pre> - # MYSECRET=`printf %s "letmein" | base64` - # virsh secret-set-value 718c71bd-67b5-4a2b-87ec-a24e8ca200dc $MYSECRET - Secret value set +# MYSECRET=`printf %s "letmein" | base64` +# virsh secret-set-value 718c71bd-67b5-4a2b-87ec-a24e8ca200dc $MYSECRET +Secret value set </pre> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/formatstorage.html.in | 280 ++++++++++++++++++++++----------------------- 1 file changed, 140 insertions(+), 140 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 56b4928..ed1f0d1 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -31,13 +31,13 @@ <h3><a name="StoragePoolFirst">General metadata</a></h3> <pre> - <pool type="iscsi"> - <name>virtimages</name> - <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid> - <allocation>10000000</allocation> - <capacity>50000000</capacity> - <available>40000000</available> - ...</pre> +<pool type="iscsi"> + <name>virtimages</name> + <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid> + <allocation>10000000</allocation> + <capacity>50000000</capacity> + <available>40000000</available> + ...</pre> <dl> <dt><code>name</code></dt> @@ -75,50 +75,50 @@ </p> <pre> - ... - <source> - <host name="iscsi.example.com"/> - <device path="iqn.2013-06.com.example:iscsi-pool"/> - <auth type='chap' username='myname'> - <secret usage='mycluster_myname'/> - </auth> - <vendor name="Acme"/> - <product name="model"/> - </source> - ...</pre> +... +<source> + <host name="iscsi.example.com"/> + <device path="iqn.2013-06.com.example:iscsi-pool"/> + <auth type='chap' username='myname'> + <secret usage='mycluster_myname'/> + </auth> + <vendor name="Acme"/> + <product name="model"/> +</source> +...</pre> <pre> - ... - <source> - <device path='/dev/mapper/mpatha' part_separator='no'/> - <format type='gpt'/> - </source> - ...</pre> +... +<source> + <device path='/dev/mapper/mpatha' part_separator='no'/> + <format type='gpt'/> +</source> +...</pre> <pre> - ... - <source> - <adapter type='scsi_host' name='scsi_host1'/> - </source> - ...</pre> +... +<source> + <adapter type='scsi_host' name='scsi_host1'/> +</source> +...</pre> <pre> - ... - <source> - <adapter type='scsi_host'> - <parentaddr unique_id='1'> - <address domain='0x0000' bus='0x00' slot='0x1f' addr='0x2'/> - </parentaddr> - </adapter> - </source> - ...</pre> +... +<source> + <adapter type='scsi_host'> + <parentaddr unique_id='1'> + <address domain='0x0000' bus='0x00' slot='0x1f' addr='0x2'/> + </parentaddr> + </adapter> +</source> +...</pre> <pre> - ... - <source> - <adapter type='fc_host' parent='scsi_host5' wwnn='20000000c9831b4b' wwpn='10000000c9831b4b'/> - </source> - ...</pre> +... +<source> + <adapter type='fc_host' parent='scsi_host5' wwnn='20000000c9831b4b' wwpn='10000000c9831b4b'/> +</source> +...</pre> <dl> <dt><code>device</code></dt> @@ -387,25 +387,25 @@ </p> <pre> - ... - <target> - <path>/dev/disk/by-path</path> - <permissions> - <owner>107</owner> - <group>107</group> - <mode>0744</mode> - <label>virt_image_t</label> - </permissions> - <timestamps> - <atime>1341933637.273190990</atime> - <mtime>1341930622.047245868</mtime> - <ctime>1341930622.047245868</ctime> - </timestamps> - <encryption type='...'> - ... - </encryption> - </target> - </pool></pre> + ... + <target> + <path>/dev/disk/by-path</path> + <permissions> + <owner>107</owner> + <group>107</group> + <mode>0744</mode> + <label>virt_image_t</label> + </permissions> + <timestamps> + <atime>1341933637.273190990</atime> + <mtime>1341930622.047245868</mtime> + <ctime>1341930622.047245868</ctime> + </timestamps> + <encryption type='...'> + ... + </encryption> + </target> +</pool></pre> <dl> <dt><code>path</code></dt> @@ -494,12 +494,12 @@ <h3><a name="StorageVolFirst">General metadata</a></h3> <pre> - <volume type='file'> - <name>sparse.img</name> - <key>/var/lib/xen/images/sparse.img</key> - <allocation>0</allocation> - <capacity unit="T">1</capacity> - ...</pre> +<volume type='file'> + <name>sparse.img</name> + <key>/var/lib/xen/images/sparse.img</key> + <allocation>0</allocation> + <capacity unit="T">1</capacity> + ...</pre> <dl> <dt><code>name</code></dt> @@ -575,22 +575,22 @@ </p> <pre> - ... - <target> - <path>/var/lib/virt/images/sparse.img</path> - <format type='qcow2'/> - <permissions> - <owner>107</owner> - <group>107</group> - <mode>0744</mode> - <label>virt_image_t</label> - </permissions> - <compat>1.1</compat> - <nocow/> - <features> - <lazy_refcounts/> - </features> - </target></pre> +... +<target> + <path>/var/lib/virt/images/sparse.img</path> + <format type='qcow2'/> + <permissions> + <owner>107</owner> + <group>107</group> + <mode>0744</mode> + <label>virt_image_t</label> + </permissions> + <compat>1.1</compat> + <nocow/> + <features> + <lazy_refcounts/> + </features> +</target></pre> <dl> <dt><code>path</code></dt> @@ -665,18 +665,18 @@ </p> <pre> - ... - <backingStore> - <path>/var/lib/virt/images/master.img</path> - <format type='raw'/> - <permissions> - <owner>107</owner> - <group>107</group> - <mode>0744</mode> - <label>virt_image_t</label> - </permissions> - </backingStore> - </volume></pre> + ... + <backingStore> + <path>/var/lib/virt/images/master.img</path> + <format type='raw'/> + <permissions> + <owner>107</owner> + <group>107</group> + <mode>0744</mode> + <label>virt_image_t</label> + </permissions> + </backingStore> +</volume></pre> <dl> <dt><code>path</code></dt> @@ -711,62 +711,62 @@ <h3><a name="exampleFile">File based storage pool</a></h3> <pre> - <pool type="dir"> - <name>virtimages</name> - <target> - <path>/var/lib/virt/images</path> - </target> - </pool></pre> +<pool type="dir"> + <name>virtimages</name> + <target> + <path>/var/lib/virt/images</path> + </target> +</pool></pre> <h3><a name="exampleISCSI">iSCSI based storage pool</a></h3> <pre> - <pool type="iscsi"> - <name>virtimages</name> - <source> - <host name="iscsi.example.com"/> - <device path="iqn.2013-06.com.example:iscsi-pool"/> - <auth type='chap' username='myuser'> - <secret usage='libvirtiscsi'/> - </auth> - </source> - <target> - <path>/dev/disk/by-path</path> - </target> - </pool></pre> +<pool type="iscsi"> + <name>virtimages</name> + <source> + <host name="iscsi.example.com"/> + <device path="iqn.2013-06.com.example:iscsi-pool"/> + <auth type='chap' username='myuser'> + <secret usage='libvirtiscsi'/> + </auth> + </source> + <target> + <path>/dev/disk/by-path</path> + </target> +</pool></pre> <h3><a name="exampleVol">Storage volume</a></h3> <pre> - <volume> - <name>sparse.img</name> - <allocation>0</allocation> - <capacity unit="T">1</capacity> - <target> - <path>/var/lib/virt/images/sparse.img</path> - <permissions> - <owner>107</owner> - <group>107</group> - <mode>0744</mode> - <label>virt_image_t</label> - </permissions> - </target> - </volume></pre> +<volume> + <name>sparse.img</name> + <allocation>0</allocation> + <capacity unit="T">1</capacity> + <target> + <path>/var/lib/virt/images/sparse.img</path> + <permissions> + <owner>107</owner> + <group>107</group> + <mode>0744</mode> + <label>virt_image_t</label> + </permissions> + </target> +</volume></pre> <h3><a name="exampleLuks">Storage volume using LUKS</a></h3> <pre> - <volume> - <name>MyLuks.img</name> - <capacity unit="G">5</capacity> - <target> - <path>/var/lib/virt/images/MyLuks.img</path> - <format type='raw'/> - <encryption format='luks'> - <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> - </encryption> - </target> - </volume> +<volume> + <name>MyLuks.img</name> + <capacity unit="G">5</capacity> + <target> + <path>/var/lib/virt/images/MyLuks.img</path> + <format type='raw'/> + <encryption format='luks'> + <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> + </encryption> + </target> +</volume> </pre> </body> </html> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/formatstorageencryption.html.in | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index 1511305..ec09bc6 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -126,9 +126,9 @@ </p> <pre> - <encryption format='qcow'> - <secret type='passphrase' uuid='c1f11a6d-8c5d-4a3e-ac7a-4e171c5e0d4a' /> - </encryption></pre> +<encryption format='qcow'> + <secret type='passphrase' uuid='c1f11a6d-8c5d-4a3e-ac7a-4e171c5e0d4a' /> +</encryption></pre> <p> Assuming a <a href="formatsecret.html#VolumeUsageType"> @@ -138,9 +138,9 @@ as part of a domain volume definition: </p> <pre> - <encryption format='luks'> - <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> - </encryption> +<encryption format='luks'> + <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> +</encryption> </pre> <p> @@ -148,19 +148,19 @@ a specific cipher algorithm for volume creation: </p> <pre> - <volume> - <name>twofish.luks</name> - <capacity unit='G'>5</capacity> - <target> - <path>/var/lib/libvirt/images/demo.luks</path> - <format type='raw'/> - <encryption format='luks'> - <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> - <cipher name='twofish' size='256' mode='cbc' hash='sha256'/> - <ivgen name='plain64' hash='sha256'/> - </encryption> - </target> - </volume> +<volume> + <name>twofish.luks</name> + <capacity unit='G'>5</capacity> + <target> + <path>/var/lib/libvirt/images/demo.luks</path> + <format type='raw'/> + <encryption format='luks'> + <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> + <cipher name='twofish' size='256' mode='cbc' hash='sha256'/> + <ivgen name='plain64' hash='sha256'/> + </encryption> + </target> +</volume> </pre> </body> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/internals/command.html.in | 172 ++++++++++++++++++++--------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index 17d1360..c6131e3 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -83,7 +83,7 @@ </p> <pre> - virCommandPtr cmd = virCommandNew("/usr/bin/dnsmasq"); +virCommandPtr cmd = virCommandNew("/usr/bin/dnsmasq"); </pre> <p> @@ -100,7 +100,7 @@ </p> <pre> - virCommandAddArg(cmd, "-strict-order"); +virCommandAddArg(cmd, "-strict-order"); </pre> <p> @@ -109,7 +109,7 @@ </p> <pre> - virCommandAddArgPair(cmd, "--conf-file", "/etc/dnsmasq.conf"); +virCommandAddArgPair(cmd, "--conf-file", "/etc/dnsmasq.conf"); </pre> <p> @@ -118,7 +118,7 @@ </p> <pre> - virCommandAddArgFormat(cmd, "%d", count); +virCommandAddArgFormat(cmd, "%d", count); </pre> <p> @@ -127,11 +127,11 @@ </p> <pre> - const char *const args[] = { - "--strict-order", "--except-interface", "lo", NULL - }; - virCommandAddArgSet(cmd, args); - virCommandAddArgList(cmd, "--domain", "localdomain", NULL); +const char *const args[] = { + "--strict-order", "--except-interface", "lo", NULL +}; +virCommandAddArgSet(cmd, args); +virCommandAddArgList(cmd, "--domain", "localdomain", NULL); </pre> <p> @@ -140,14 +140,14 @@ </p> <pre> - const char *const args[] = { - "/usr/bin/dnsmasq", - "--strict-order", "--except-interface", - "lo", "--domain", "localdomain", NULL - }; - virCommandPtr cmd1 = virCommandNewArgs(cmd, args); - virCommandPtr cmd2 = virCommandNewArgList("/usr/bin/dnsmasq", - "--domain", "localdomain", NULL); +const char *const args[] = { + "/usr/bin/dnsmasq", + "--strict-order", "--except-interface", + "lo", "--domain", "localdomain", NULL +}; +virCommandPtr cmd1 = virCommandNewArgs(cmd, args); +virCommandPtr cmd2 = virCommandNewArgList("/usr/bin/dnsmasq", + "--domain", "localdomain", NULL); </pre> <h3><a name="env">Setting up the environment</a></h3> @@ -163,7 +163,7 @@ </p> <pre> - virCommandAddEnvPassCommon(cmd); +virCommandAddEnvPassCommon(cmd); </pre> <p> @@ -177,8 +177,8 @@ </p> <pre> - virCommandAddEnvPass(cmd, "DISPLAY"); - virCommandAddEnvPass(cmd, "XAUTHORITY"); +virCommandAddEnvPass(cmd, "DISPLAY"); +virCommandAddEnvPass(cmd, "XAUTHORITY"); </pre> <p> @@ -187,7 +187,7 @@ </p> <pre> - virCommandAddEnvPair(cmd, "TERM", "xterm"); +virCommandAddEnvPair(cmd, "TERM", "xterm"); </pre> <p> @@ -196,7 +196,7 @@ </p> <pre> - virCommandAddEnvString(cmd, "TERM=xterm"); +virCommandAddEnvString(cmd, "TERM=xterm"); </pre> <h3><a name="misc">Miscellaneous other options</a></h3> @@ -210,7 +210,7 @@ </p> <pre> - virCommandDaemonize(cmd); +virCommandDaemonize(cmd); </pre> <p> @@ -221,7 +221,7 @@ </p> <pre> - virCommandSetPidFile(cmd, "/var/run/dnsmasq.pid"); +virCommandSetPidFile(cmd, "/var/run/dnsmasq.pid"); </pre> <p> @@ -240,7 +240,7 @@ </p> <pre> - virCommandClearCaps(cmd); +virCommandClearCaps(cmd); </pre> <h3><a name="fds">Managing file handles</a></h3> @@ -256,13 +256,13 @@ </p> <pre> - int sharedfd = open("cmd.log", "w+"); - int childfd = open("conf.txt", "r"); - virCommandPassFD(cmd, sharedfd, 0); - virCommandPassFD(cmd, childfd, - VIR_COMMAND_PASS_FD_CLOSE_PARENT); - if (VIR_CLOSE(sharedfd) < 0) - goto cleanup; +int sharedfd = open("cmd.log", "w+"); +int childfd = open("conf.txt", "r"); +virCommandPassFD(cmd, sharedfd, 0); +virCommandPassFD(cmd, childfd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT); +if (VIR_CLOSE(sharedfd) < 0) + goto cleanup; </pre> <p> @@ -282,7 +282,7 @@ </p> <pre> - virCommandSetInputFD(cmd, 7); +virCommandSetInputFD(cmd, 7); </pre> <p> @@ -291,10 +291,10 @@ </p> <pre> - int outfd = open("out.log", "w+"); - int errfd = open("err.log", "w+"); - virCommandSetOutputFD(cmd, &outfd); - virCommandSetErrorFD(cmd, &errfd); +int outfd = open("out.log", "w+"); +int errfd = open("err.log", "w+"); +virCommandSetOutputFD(cmd, &outfd); +virCommandSetErrorFD(cmd, &errfd); </pre> <p> @@ -304,10 +304,10 @@ </p> <pre> - int outfd = -1; - int errfd = -1 - virCommandSetOutputFD(cmd, &outfd); - virCommandSetErrorFD(cmd, &errfd); +int outfd = -1; +int errfd = -1 +virCommandSetOutputFD(cmd, &outfd); +virCommandSetErrorFD(cmd, &errfd); </pre> <p> @@ -326,7 +326,7 @@ </p> <pre> - virCommandNonblockingFDs(cmd); +virCommandNonblockingFDs(cmd); </pre> <h3><a name="buffers">Feeding & capturing strings to/from the child</a></h3> @@ -350,8 +350,8 @@ </p> <pre> - const char *input = "Hello World\n"; - virCommandSetInputBuffer(cmd, input); +const char *input = "Hello World\n"; +virCommandSetInputBuffer(cmd, input); </pre> <p> @@ -362,9 +362,9 @@ </p> <pre> - char *output = NULL, *errors = NULL; - virCommandSetOutputBuffer(cmd, &output); - virCommandSetErrorBuffer(cmd, &errors); +char *output = NULL, *errors = NULL; +virCommandSetOutputBuffer(cmd, &output); +virCommandSetErrorBuffer(cmd, &errors); </pre> <p> @@ -392,7 +392,7 @@ </p> <pre> - virCommandSetWorkingDirectory(cmd, LOCALSTATEDIR); +virCommandSetWorkingDirectory(cmd, LOCALSTATEDIR); </pre> <h3><a name="hooks">Any additional hooks</a></h3> @@ -406,7 +406,7 @@ </p> <pre> - virCommandSetPreExecHook(cmd, hook, opaque); +virCommandSetPreExecHook(cmd, hook, opaque); </pre> <h3><a name="logging">Logging commands</a></h3> @@ -418,20 +418,20 @@ </p> <pre> - int logfd = ...; - char *timestamp = virTimestamp(); - char *string = NULL; +int logfd = ...; +char *timestamp = virTimestamp(); +char *string = NULL; - dprintf(logfd, "%s: ", timestamp); - VIR_FREE(timestamp); - virCommandWriteArgLog(cmd, logfd); +dprintf(logfd, "%s: ", timestamp); +VIR_FREE(timestamp); +virCommandWriteArgLog(cmd, logfd); - string = virCommandToString(cmd); - if (string) - VIR_DEBUG("about to run %s", string); - VIR_FREE(string); - if (virCommandRun(cmd, NULL) < 0) - return -1; +string = virCommandToString(cmd); +if (string) + VIR_DEBUG("about to run %s", string); +VIR_FREE(string); +if (virCommandRun(cmd, NULL) < 0) + return -1; </pre> <h3><a name="sync">Running commands synchronously</a></h3> @@ -443,8 +443,8 @@ </p> <pre> - if (virCommandRun(cmd, NULL) < 0) - return -1; +if (virCommandRun(cmd, NULL) < 0) + return -1; </pre> <p> @@ -465,19 +465,19 @@ </p> <pre> - int status; - if (virCommandRun(cmd, &status) < 0) - return -1; - if (status == 1) { - ...do stuff... - } +int status; +if (virCommandRun(cmd, &status) < 0) + return -1; +if (status == 1) { + ...do stuff... +} - virCommandRawStatus(cmd2); - if (virCommandRun(cmd2, &status) < 0) - return -1; - if (WIFEXITED(status) && WEXITSTATUS(status) == 1) { - ...do stuff... - } +virCommandRawStatus(cmd2); +if (virCommandRun(cmd2, &status) < 0) + return -1; +if (WIFEXITED(status) && WEXITSTATUS(status) == 1) { + ...do stuff... +} </pre> <h3><a name="async">Running commands asynchronously</a></h3> @@ -490,19 +490,19 @@ </p> <pre> - pid_t pid; - if (virCommandRunAsync(cmd, &pid) < 0) - return -1; +pid_t pid; +if (virCommandRunAsync(cmd, &pid) < 0) + return -1; - ... do something while pid is running ... +... do something while pid is running ... - int status; - if (virCommandWait(cmd, &status) < 0) - return -1; +int status; +if (virCommandWait(cmd, &status) < 0) + return -1; - if (WEXITSTATUS(status)...) { - ..do stuff.. - } +if (WEXITSTATUS(status)...) { + ..do stuff.. +} </pre> <p> @@ -540,7 +540,7 @@ </p> <pre> - virCommandFree(cmd); +virCommandFree(cmd); </pre> <p> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/internals/locking.html.in | 132 ++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/docs/internals/locking.html.in b/docs/internals/locking.html.in index 0317c78..09cc2ba 100644 --- a/docs/internals/locking.html.in +++ b/docs/internals/locking.html.in @@ -122,7 +122,7 @@ </p> <pre> - #include <libvirt/plugins/lock_manager.h> +#include <libvirt/plugins/lock_manager.h> </pre> <p> @@ -141,7 +141,7 @@ </p> <pre> - lockManager="sanlock" +lockManager="sanlock" </pre> <p> @@ -169,40 +169,40 @@ </p> <pre> - virLockManagerParam params[] = { - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UUID, - .key = "uuid", - }, - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_STRING, - .key = "name", - .value = { .str = dom->def->name }, - }, - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, - .key = "id", - .value = { .i = dom->def->id }, - }, - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, - .key = "pid", - .value = { .i = dom->pid }, - }, - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING, - .key = "uri", - .value = { .cstr = driver->uri }, - }, - }; - mgr = virLockManagerNew(lockPlugin, - VIR_LOCK_MANAGER_TYPE_DOMAIN, - ARRAY_CARDINALITY(params), - params, - 0))); +virLockManagerParam params[] = { + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UUID, + .key = "uuid", + }, + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_STRING, + .key = "name", + .value = { .str = dom->def->name }, + }, + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, + .key = "id", + .value = { .i = dom->def->id }, + }, + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, + .key = "pid", + .value = { .i = dom->pid }, + }, + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING, + .key = "uri", + .value = { .cstr = driver->uri }, + }, +}; +mgr = virLockManagerNew(lockPlugin, + VIR_LOCK_MANAGER_TYPE_DOMAIN, + ARRAY_CARDINALITY(params), + params, + 0))); - foreach (initial disks) - virLockManagerAddResource(mgr, - VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK, - $path, 0, NULL, $flags); +foreach (initial disks) + virLockManagerAddResource(mgr, + VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK, + $path, 0, NULL, $flags); - if (virLockManagerAcquire(lock, NULL, 0) < 0); - ...abort... +if (virLockManagerAcquire(lock, NULL, 0) < 0); + ...abort... </pre> <h3><a name="usageLockAttach">Lock release</a></h3> @@ -214,40 +214,40 @@ </p> <pre> - char *state = NULL; - virLockManagerParam params[] = { - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UUID, - .key = "uuid", - }, - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_STRING, - .key = "name", - .value = { .str = dom->def->name }, - }, - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, - .key = "id", - .value = { .i = dom->def->id }, - }, - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, - .key = "pid", - .value = { .i = dom->pid }, - }, - { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING, - .key = "uri", - .value = { .cstr = driver->uri }, - }, - }; - mgr = virLockManagerNew(lockPlugin, - VIR_LOCK_MANAGER_TYPE_DOMAIN, - ARRAY_CARDINALITY(params), - params, - 0))); +char *state = NULL; +virLockManagerParam params[] = { + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UUID, + .key = "uuid", + }, + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_STRING, + .key = "name", + .value = { .str = dom->def->name }, + }, + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, + .key = "id", + .value = { .i = dom->def->id }, + }, + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, + .key = "pid", + .value = { .i = dom->pid }, + }, + { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING, + .key = "uri", + .value = { .cstr = driver->uri }, + }, +}; +mgr = virLockManagerNew(lockPlugin, + VIR_LOCK_MANAGER_TYPE_DOMAIN, + ARRAY_CARDINALITY(params), + params, + 0))); - foreach (initial disks) - virLockManagerAddResource(mgr, - VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK, - $path, 0, NULL, $flags); +foreach (initial disks) + virLockManagerAddResource(mgr, + VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK, + $path, 0, NULL, $flags); - virLockManagerRelease(mgr, & state, 0); +virLockManagerRelease(mgr, & state, 0); </pre> <p> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/internals/rpc.html.in | 220 ++++++++++++++++++++++----------------------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/docs/internals/rpc.html.in b/docs/internals/rpc.html.in index a48a4c0..9107b97 100644 --- a/docs/internals/rpc.html.in +++ b/docs/internals/rpc.html.in @@ -210,13 +210,13 @@ </p> <pre> - +--+-----------------------+-----------+ - C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call) - +--+-----------------------+-----------+ + +--+-----------------------+-----------+ +C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call) + +--+-----------------------+-----------+ - +--+-----------------------+--------+ - C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) - +--+-----------------------+--------+ + +--+-----------------------+--------+ +C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) + +--+-----------------------+--------+ </pre> <h4><a name="wireexamplescallerr">Method call with error</a></h4> @@ -226,13 +226,13 @@ </p> <pre> - +--+-----------------------+-----------+ - C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call) - +--+-----------------------+-----------+ + +--+-----------------------+-----------+ +C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call) + +--+-----------------------+-----------+ - +--+-----------------------+--------------------------+ - C <-- |48| 8 | 1 | 3 | 2 | 1 | 0 | .o.oOo.o.oOo.o.oOo.o.oOo | <-- S (error) - +--+-----------------------+--------------------------+ + +--+-----------------------+--------------------------+ +C <-- |48| 8 | 1 | 3 | 2 | 1 | 0 | .o.oOo.o.oOo.o.oOo.o.oOo | <-- S (error) + +--+-----------------------+--------------------------+ </pre> <h4><a name="wireexamplescallup">Method call with upload stream</a></h4> @@ -243,33 +243,33 @@ </p> <pre> - +--+-----------------------+-----------+ - C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call) - +--+-----------------------+-----------+ + +--+-----------------------+-----------+ +C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call) + +--+-----------------------+-----------+ - +--+-----------------------+--------+ - C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) - +--+-----------------------+--------+ + +--+-----------------------+--------+ +C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) + +--+-----------------------+--------+ - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - ... - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - +--+-----------------------+ - C --> |24| 8 | 1 | 3 | 3 | 1 | 0 | --> S (stream finish) - +--+-----------------------+ - +--+-----------------------+ - C <-- |24| 8 | 1 | 3 | 3 | 1 | 0 | <-- S (stream finish) - +--+-----------------------+ + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + ... + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + +--+-----------------------+ +C --> |24| 8 | 1 | 3 | 3 | 1 | 0 | --> S (stream finish) + +--+-----------------------+ + +--+-----------------------+ +C <-- |24| 8 | 1 | 3 | 3 | 1 | 0 | <-- S (stream finish) + +--+-----------------------+ </pre> <h4><a name="wireexamplescallbi">Method call bidirectional stream</a></h4> @@ -280,80 +280,80 @@ </p> <pre> - +--+-----------------------+-----------+ - C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call) - +--+-----------------------+-----------+ + +--+-----------------------+-----------+ +C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call) + +--+-----------------------+-----------+ - +--+-----------------------+--------+ - C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) - +--+-----------------------+--------+ + +--+-----------------------+--------+ +C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) + +--+-----------------------+--------+ - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C <-- |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | <-- S (stream data down) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C <-- |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | <-- S (stream data down) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C <-- |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | <-- S (stream data down) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C <-- |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | <-- S (stream data down) - +--+-----------------------+-------------....-------+ - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - .. - +--+-----------------------+-------------....-------+ - C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) - +--+-----------------------+-------------....-------+ - +--+-----------------------+ - C --> |24| 8 | 1 | 3 | 3 | 1 | 0 | --> S (stream finish) - +--+-----------------------+ - +--+-----------------------+ - C <-- |24| 8 | 1 | 3 | 3 | 1 | 0 | <-- S (stream finish) - +--+-----------------------+ + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C <-- |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | <-- S (stream data down) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C <-- |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | <-- S (stream data down) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C <-- |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | <-- S (stream data down) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C <-- |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | <-- S (stream data down) + +--+-----------------------+-------------....-------+ + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + .. + +--+-----------------------+-------------....-------+ +C --> |38| 8 | 1 | 3 | 3 | 1 | 2 | .o.oOo.o.oOo....o.oOo. | --> S (stream data up) + +--+-----------------------+-------------....-------+ + +--+-----------------------+ +C --> |24| 8 | 1 | 3 | 3 | 1 | 0 | --> S (stream finish) + +--+-----------------------+ + +--+-----------------------+ +C <-- |24| 8 | 1 | 3 | 3 | 1 | 0 | <-- S (stream finish) + +--+-----------------------+ </pre> <h4><a name="wireexamplescallmany">Method calls overlapping</a></h4> <pre> - +--+-----------------------+-----------+ - C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call 1) - +--+-----------------------+-----------+ - +--+-----------------------+-----------+ - C --> |38| 8 | 1 | 3 | 0 | 2 | 0 | .o.oOo.o. | --> S (call 2) - +--+-----------------------+-----------+ - +--+-----------------------+--------+ - C <-- |32| 8 | 1 | 3 | 1 | 2 | 0 | .o.oOo | <-- S (reply 2) - +--+-----------------------+--------+ - +--+-----------------------+-----------+ - C --> |38| 8 | 1 | 3 | 0 | 3 | 0 | .o.oOo.o. | --> S (call 3) - +--+-----------------------+-----------+ - +--+-----------------------+--------+ - C <-- |32| 8 | 1 | 3 | 1 | 3 | 0 | .o.oOo | <-- S (reply 3) - +--+-----------------------+--------+ - +--+-----------------------+-----------+ - C --> |38| 8 | 1 | 3 | 0 | 4 | 0 | .o.oOo.o. | --> S (call 4) - +--+-----------------------+-----------+ - +--+-----------------------+--------+ - C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply 1) - +--+-----------------------+--------+ - +--+-----------------------+--------+ - C <-- |32| 8 | 1 | 3 | 1 | 4 | 0 | .o.oOo | <-- S (reply 4) - +--+-----------------------+--------+ + +--+-----------------------+-----------+ +C --> |38| 8 | 1 | 3 | 0 | 1 | 0 | .o.oOo.o. | --> S (call 1) + +--+-----------------------+-----------+ + +--+-----------------------+-----------+ +C --> |38| 8 | 1 | 3 | 0 | 2 | 0 | .o.oOo.o. | --> S (call 2) + +--+-----------------------+-----------+ + +--+-----------------------+--------+ +C <-- |32| 8 | 1 | 3 | 1 | 2 | 0 | .o.oOo | <-- S (reply 2) + +--+-----------------------+--------+ + +--+-----------------------+-----------+ +C --> |38| 8 | 1 | 3 | 0 | 3 | 0 | .o.oOo.o. | --> S (call 3) + +--+-----------------------+-----------+ + +--+-----------------------+--------+ +C <-- |32| 8 | 1 | 3 | 1 | 3 | 0 | .o.oOo | <-- S (reply 3) + +--+-----------------------+--------+ + +--+-----------------------+-----------+ +C --> |38| 8 | 1 | 3 | 0 | 4 | 0 | .o.oOo.o. | --> S (call 4) + +--+-----------------------+-----------+ + +--+-----------------------+--------+ +C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply 1) + +--+-----------------------+--------+ + +--+-----------------------+--------+ +C <-- |32| 8 | 1 | 3 | 1 | 4 | 0 | .o.oOo | <-- S (reply 4) + +--+-----------------------+--------+ </pre> <h4><a name="wireexamplescallfd">Method call with passed FD</a></h4> @@ -368,13 +368,13 @@ </p> <pre> - +--+-----------------------+---------------+-------+ - C --> |44| 8 | 1 | 3 | 0 | 1 | 0 | 2 | .o.oOo.o. | 0 | 0 | --> S (call) - +--+-----------------------+---------------+-------+ + +--+-----------------------+---------------+-------+ +C --> |44| 8 | 1 | 3 | 0 | 1 | 0 | 2 | .o.oOo.o. | 0 | 0 | --> S (call) + +--+-----------------------+---------------+-------+ - +--+-----------------------+--------+ - C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) - +--+-----------------------+--------+ + +--+-----------------------+--------+ +C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) + +--+-----------------------+--------+ </pre> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/locking-lockd.html.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/locking-lockd.html.in b/docs/locking-lockd.html.in index 68db0ca..fe007b1 100644 --- a/docs/locking-lockd.html.in +++ b/docs/locking-lockd.html.in @@ -40,8 +40,8 @@ </p> <pre> - # chkconfig virtlockd on - # service virtlockd start +# chkconfig virtlockd on +# service virtlockd start </pre> <p> @@ -92,10 +92,10 @@ </p> <pre> - $ su - root - # augtool -s set \ - /files/etc/libvirt/qemu-lockd.conf/file_lockspace_dir \ - "/var/lib/libvirt/lockd/files" +$ su - root +# augtool -s set \ + /files/etc/libvirt/qemu-lockd.conf/file_lockspace_dir \ + "/var/lib/libvirt/lockd/files" </pre> <p> @@ -110,13 +110,13 @@ </p> <pre> - $ su - root - # augtool -s set \ - /files/etc/libvirt/qemu-lockd.conf/scsi_lockspace_dir \ - "/var/lib/libvirt/lockd/scsi" - # augtool -s set \ - /files/etc/libvirt/qemu-lockd.conf/lvm_lockspace_dir \ - "/var/lib/libvirt/lockd/lvm" +$ su - root +# augtool -s set \ + /files/etc/libvirt/qemu-lockd.conf/scsi_lockspace_dir \ + "/var/lib/libvirt/lockd/scsi" +# augtool -s set \ + /files/etc/libvirt/qemu-lockd.conf/lvm_lockspace_dir \ + "/var/lib/libvirt/lockd/lvm" </pre> <p> @@ -143,9 +143,9 @@ </p> <pre> - $ su - root - # augtool -s set /files/etc/libvirt/qemu.conf/lock_manager lockd - # service libvirtd restart +$ su - root +# augtool -s set /files/etc/libvirt/qemu.conf/lock_manager lockd +# service libvirtd restart </pre> <p> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/locking-sanlock.html.in | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/locking-sanlock.html.in b/docs/locking-sanlock.html.in index 84b1fb3..12fc3d7 100644 --- a/docs/locking-sanlock.html.in +++ b/docs/locking-sanlock.html.in @@ -23,8 +23,8 @@ </p> <pre> - $ su - root - # yum install libvirt-lock-sanlock +$ su - root +# yum install libvirt-lock-sanlock </pre> <p> @@ -37,9 +37,9 @@ </p> <pre> - $ su - root - # chkconfig wdmd on - # service wdmd start +$ su - root +# chkconfig wdmd on +# service wdmd start </pre> <p> @@ -48,8 +48,8 @@ </p> <pre> - # chkconfig sanlock on - # service sanlock start +# chkconfig sanlock on +# service sanlock start </pre> <p> @@ -59,7 +59,7 @@ </p> <pre> - SANLOCKOPTS="-w 0" +SANLOCKOPTS="-w 0" </pre> <p> @@ -82,8 +82,8 @@ </p> <pre> - $ su - root - # augtool -s set /files/etc/libvirt/qemu-sanlock.conf/host_id 1 +$ su - root +# augtool -s set /files/etc/libvirt/qemu-sanlock.conf/host_id 1 </pre> <p> @@ -104,9 +104,9 @@ </p> <pre> - $ su - root - # echo "some.nfs.server:/export/sanlock /var/lib/libvirt/sanlock nfs hard,nointr 0 0" >> /etc/fstab - # mount /var/lib/libvirt/sanlock +$ su - root +# echo "some.nfs.server:/export/sanlock /var/lib/libvirt/sanlock nfs hard,nointr 0 0" >> /etc/fstab +# mount /var/lib/libvirt/sanlock </pre> <p> @@ -121,8 +121,8 @@ </p> <pre> - augtool -s set /files/etc/libvirt/qemu-sanlock.conf/user sanlock - augtool -s set /files/etc/libvirt/qemu-sanlock.conf/group sanlock +augtool -s set /files/etc/libvirt/qemu-sanlock.conf/user sanlock +augtool -s set /files/etc/libvirt/qemu-sanlock.conf/group sanlock </pre> <p> @@ -168,9 +168,9 @@ </p> <pre> - $ su - root - # augtool -s set /files/etc/libvirt/qemu.conf/lock_manager sanlock - # service libvirtd restart +$ su - root +# augtool -s set /files/etc/libvirt/qemu.conf/lock_manager sanlock +# service libvirtd restart </pre> <p> @@ -180,8 +180,8 @@ </p> <pre> - # ls /var/lib/libvirt/sanlock/ - __LIBVIRT__DISKS__ +# ls /var/lib/libvirt/sanlock/ +__LIBVIRT__DISKS__ </pre> <p> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/logging.html.in | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/logging.html.in b/docs/logging.html.in index b6dc91c..bcec179 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -102,8 +102,8 @@ variables.</p> <p>The format for a filter is one of:</p> <pre> - x:name (log message only) - x:+name (log message + stack trace)</pre> +x:name (log message only) +x:+name (log message + stack trace)</pre> <p>where <code>name</code> is a string which is matched against the category given in the VIR_LOG_INIT() at the top of each libvirt source file, e.g., <code>remote</code>, <code>qemu</code>, @@ -201,23 +201,23 @@ </p> <pre> - $ journalctl MESSAGE_ID=8ae2f3fb-2dbe-498e-8fbd-012d40afa361 --output=json - { ...snip... - "LIBVIRT_SOURCE" : "file", - "PRIORITY" : "3", - "CODE_FILE" : "qemu/qemu_capabilities.c", - "CODE_LINE" : "2770", - "CODE_FUNC" : "virQEMUCapsLogProbeFailure", - "MESSAGE_ID" : "8ae2f3fb-2dbe-498e-8fbd-012d40afa361", - "LIBVIRT_QEMU_BINARY" : "/bin/qemu-system-xtensa", - "MESSAGE" : "Failed to probe capabilities for /bin/qemu-system-xtensa:" \ - "internal error: Child process (LC_ALL=C LD_LIBRARY_PATH=/home/berrange" \ - "/src/virt/libvirt/src/.libs PATH=/usr/lib64/ccache:/usr/local/sbin:" \ - "/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin HOME=/root " \ - "USER=root LOGNAME=root /bin/qemu-system-xtensa -help) unexpected " \ - "exit status 127: /bin/qemu-system-xtensa: error while loading shared " \ - "libraries: libglapi.so.0: cannot open shared object file: No such " \ - "file or directory\n" } +$ journalctl MESSAGE_ID=8ae2f3fb-2dbe-498e-8fbd-012d40afa361 --output=json +{ ...snip... + "LIBVIRT_SOURCE" : "file", + "PRIORITY" : "3", + "CODE_FILE" : "qemu/qemu_capabilities.c", + "CODE_LINE" : "2770", + "CODE_FUNC" : "virQEMUCapsLogProbeFailure", + "MESSAGE_ID" : "8ae2f3fb-2dbe-498e-8fbd-012d40afa361", + "LIBVIRT_QEMU_BINARY" : "/bin/qemu-system-xtensa", + "MESSAGE" : "Failed to probe capabilities for /bin/qemu-system-xtensa:" \ + "internal error: Child process (LC_ALL=C LD_LIBRARY_PATH=/home/berrange" \ + "/src/virt/libvirt/src/.libs PATH=/usr/lib64/ccache:/usr/local/sbin:" \ + "/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin HOME=/root " \ + "USER=root LOGNAME=root /bin/qemu-system-xtensa -help) unexpected " \ + "exit status 127: /bin/qemu-system-xtensa: error while loading shared " \ + "libraries: libglapi.so.0: cannot open shared object file: No such " \ + "file or directory\n" } </pre> <h2> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/migration.html.in | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 2768955..a57f279 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -460,19 +460,19 @@ </p> <pre> - syntax: virsh migrate GUESTNAME DEST-LIBVIRT-URI [HV-URI] +syntax: virsh migrate GUESTNAME DEST-LIBVIRT-URI [HV-URI] - eg using default network interface +eg using default network interface - virsh migrate web1 qemu+ssh://desthost/system - virsh migrate web1 xen+tls://desthost/system +virsh migrate web1 qemu+ssh://desthost/system +virsh migrate web1 xen+tls://desthost/system - eg using secondary network interface +eg using secondary network interface - virsh migrate web1 qemu://desthost/system tcp://10.0.0.1/ - virsh migrate web1 xen+tcp://desthost/system xenmigr:10.0.0.1/ +virsh migrate web1 qemu://desthost/system tcp://10.0.0.1/ +virsh migrate web1 xen+tcp://desthost/system xenmigr:10.0.0.1/ </pre> <p> @@ -538,12 +538,12 @@ </p> <pre> - syntax: virsh migrate GUESTNAME HV-URI +syntax: virsh migrate GUESTNAME HV-URI - eg using same libvirt URI for all connections +eg using same libvirt URI for all connections - virsh migrate --direct web1 xenmigr://desthost/ +virsh migrate --direct web1 xenmigr://desthost/ </pre> <p> @@ -565,22 +565,22 @@ </p> <pre> - syntax: virsh migrate GUESTNAME DEST-LIBVIRT-URI [ALT-DEST-LIBVIRT-URI] +syntax: virsh migrate GUESTNAME DEST-LIBVIRT-URI [ALT-DEST-LIBVIRT-URI] - eg using same libvirt URI for all connections +eg using same libvirt URI for all connections - virsh migrate --p2p web1 qemu+ssh://desthost/system +virsh migrate --p2p web1 qemu+ssh://desthost/system - eg using different libvirt URI auth scheme for peer2peer connections +eg using different libvirt URI auth scheme for peer2peer connections - virsh migrate --p2p web1 qemu+ssh://desthost/system qemu+tls:/desthost/system +virsh migrate --p2p web1 qemu+ssh://desthost/system qemu+tls:/desthost/system - eg using different libvirt URI hostname for peer2peer connections +eg using different libvirt URI hostname for peer2peer connections - virsh migrate --p2p web1 qemu+ssh://desthost/system qemu+ssh://10.0.0.1/system +virsh migrate --p2p web1 qemu+ssh://desthost/system qemu+ssh://10.0.0.1/system </pre> <p> @@ -606,22 +606,22 @@ </p> <pre> - syntax: virsh migrate GUESTNAME DEST-LIBVIRT-URI [ALT-DEST-LIBVIRT-URI] +syntax: virsh migrate GUESTNAME DEST-LIBVIRT-URI [ALT-DEST-LIBVIRT-URI] - eg using same libvirt URI for all connections +eg using same libvirt URI for all connections - virsh migrate --p2p --tunnelled web1 qemu+ssh://desthost/system +virsh migrate --p2p --tunnelled web1 qemu+ssh://desthost/system - eg using different libvirt URI auth scheme for peer2peer connections +eg using different libvirt URI auth scheme for peer2peer connections - virsh migrate --p2p --tunnelled web1 qemu+ssh://desthost/system qemu+tls:/desthost/system +virsh migrate --p2p --tunnelled web1 qemu+ssh://desthost/system qemu+tls:/desthost/system - eg using different libvirt URI hostname for peer2peer connections +eg using different libvirt URI hostname for peer2peer connections - virsh migrate --p2p --tunnelled web1 qemu+ssh://desthost/system qemu+ssh://10.0.0.1/system +virsh migrate --p2p --tunnelled web1 qemu+ssh://desthost/system qemu+ssh://10.0.0.1/system </pre> <p> -- 2.8.4
The <pre/> section is rendered as-is on the page. That is, if all the lines are prefixed with 4 spaces the rendered page will also have them. Problem is if we put a box around such <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/storage.html.in | 296 +++++++++++++++++++++++++-------------------------- 1 file changed, 148 insertions(+), 148 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index f1960f9..2e5b65e 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -135,12 +135,12 @@ <h3>Example pool input definition</h3> <pre> - <pool type="dir"> - <name>virtimages</name> - <target> - <path>/var/lib/virt/images</path> - </target> - </pool></pre> +<pool type="dir"> + <name>virtimages</name> + <target> + <path>/var/lib/virt/images</path> + </target> +</pool></pre> <h3>Valid pool format types</h3> <p> @@ -188,15 +188,15 @@ <h3>Example pool input</h3> <pre> - <pool type="fs"> - <name>virtimages</name> - <source> - <device path="/dev/VolGroup00/VirtImages"/> - </source> - <target> - <path>/var/lib/virt/images</path> - </target> - </pool></pre> +<pool type="fs"> + <name>virtimages</name> + <source> + <device path="/dev/VolGroup00/VirtImages"/> + </source> + <target> + <path>/var/lib/virt/images</path> + </target> +</pool></pre> <h3>Valid pool format types</h3> <p> @@ -261,17 +261,17 @@ <h3>Example pool input</h3> <pre> - <pool type="netfs"> - <name>virtimages</name> - <source> - <host name="nfs.example.com"/> - <dir path="/var/lib/virt/images"/> - <format type='nfs'/> - </source> - <target> - <path>/var/lib/virt/images</path> - </target> - </pool></pre> +<pool type="netfs"> + <name>virtimages</name> + <source> + <host name="nfs.example.com"/> + <dir path="/var/lib/virt/images"/> + <format type='nfs'/> + </source> + <target> + <path>/var/lib/virt/images</path> + </target> +</pool></pre> <h3>Valid pool format types</h3> <p> @@ -315,17 +315,17 @@ <h3>Example pool input</h3> <pre> - <pool type="logical"> - <name>HostVG</name> - <source> - <device path="/dev/sda1"/> - <device path="/dev/sdb1"/> - <device path="/dev/sdc1"/> - </source> - <target> - <path>/dev/HostVG</path> - </target> - </pool></pre> +<pool type="logical"> + <name>HostVG</name> + <source> + <device path="/dev/sda1"/> + <device path="/dev/sdb1"/> + <device path="/dev/sdc1"/> + </source> + <target> + <path>/dev/HostVG</path> + </target> +</pool></pre> <h3>Valid pool format types</h3> <p> @@ -352,15 +352,15 @@ <h3>Example pool input</h3> <pre> - <pool type="disk"> - <name>sda</name> - <source> - <device path='/dev/sda'/> - </source> - <target> - <path>/dev</path> - </target> - </pool></pre> +<pool type="disk"> + <name>sda</name> + <source> + <device path='/dev/sda'/> + </source> + <target> + <path>/dev</path> + </target> +</pool></pre> <h3>Valid pool format types</h3> <p> @@ -449,16 +449,16 @@ <h3>Example pool input</h3> <pre> - <pool type="iscsi"> - <name>virtimages</name> - <source> - <host name="iscsi.example.com"/> - <device path="iqn.2013-06.com.example:iscsi-pool"/> - </source> - <target> - <path>/dev/disk/by-path</path> - </target> - </pool></pre> +<pool type="iscsi"> + <name>virtimages</name> + <source> + <host name="iscsi.example.com"/> + <device path="iqn.2013-06.com.example:iscsi-pool"/> + </source> + <target> + <path>/dev/disk/by-path</path> + </target> +</pool></pre> <h3>Valid pool format types</h3> <p> @@ -482,15 +482,15 @@ <h3>Example pool input</h3> <pre> - <pool type="scsi"> - <name>virtimages</name> - <source> - <adapter name="host0"/> - </source> - <target> - <path>/dev/disk/by-path</path> - </target> - </pool></pre> +<pool type="scsi"> + <name>virtimages</name> + <source> + <adapter name="host0"/> + </source> + <target> + <path>/dev/disk/by-path</path> + </target> +</pool></pre> <h3>Valid pool format types</h3> <p> @@ -518,12 +518,12 @@ <h3>Example pool input</h3> <pre> - <pool type="mpath"> - <name>virtimages</name> - <target> - <path>/dev/mapper</path> - </target> - </pool></pre> +<pool type="mpath"> + <name>virtimages</name> + <target> + <path>/dev/mapper</path> + </target> +</pool></pre> <h3>Valid pool format types</h3> <p> @@ -558,38 +558,38 @@ <h3>Example pool input</h3> <pre> - <pool type="rbd"> - <name>myrbdpool</name> - <source> - <name>rbdpool</name> - <host name='1.2.3.4'/> - <host name='my.ceph.monitor'/> - <host name='third.ceph.monitor' port='6789'/> - <auth username='admin' type='ceph'> - <secret uuid='2ec115d7-3a88-3ceb-bc12-0ac909a6fd87'/> - </auth> - </source> - </pool></pre> +<pool type="rbd"> + <name>myrbdpool</name> + <source> + <name>rbdpool</name> + <host name='1.2.3.4'/> + <host name='my.ceph.monitor'/> + <host name='third.ceph.monitor' port='6789'/> + <auth username='admin' type='ceph'> + <secret uuid='2ec115d7-3a88-3ceb-bc12-0ac909a6fd87'/> + </auth> + </source> +</pool></pre> <h3>Example volume output</h3> <pre> - <volume> - <name>myvol</name> - <key>rbd/myvol</key> - <source> - </source> - <capacity unit='bytes'>53687091200</capacity> - <allocation unit='bytes'>53687091200</allocation> - <target> - <path>rbd:rbd/myvol</path> - <format type='unknown'/> - <permissions> - <mode>00</mode> - <owner>0</owner> - <group>0</group> - </permissions> - </target> - </volume></pre> +<volume> + <name>myvol</name> + <key>rbd/myvol</key> + <source> + </source> + <capacity unit='bytes'>53687091200</capacity> + <allocation unit='bytes'>53687091200</allocation> + <target> + <path>rbd:rbd/myvol</path> + <format type='unknown'/> + <permissions> + <mode>00</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</volume></pre> <h3>Example disk attachment</h3> <p>RBD images can be attached to Qemu guests when Qemu is built @@ -622,33 +622,33 @@ <h3>Example pool input</h3> <pre> - <pool type="sheepdog"> - <name>mysheeppool</name> - <source> - <name>mysheeppool</name> - <host name='localhost' port='7000'/> - </source> - </pool></pre> +<pool type="sheepdog"> + <name>mysheeppool</name> + <source> + <name>mysheeppool</name> + <host name='localhost' port='7000'/> + </source> +</pool></pre> <h3>Example volume output</h3> <pre> - <volume> - <name>myvol</name> - <key>sheep/myvol</key> - <source> - </source> - <capacity unit='bytes'>53687091200</capacity> - <allocation unit='bytes'>53687091200</allocation> - <target> - <path>sheepdog:myvol</path> - <format type='unknown'/> - <permissions> - <mode>00</mode> - <owner>0</owner> - <group>0</group> - </permissions> - </target> - </volume></pre> +<volume> + <name>myvol</name> + <key>sheep/myvol</key> + <source> + </source> + <capacity unit='bytes'>53687091200</capacity> + <allocation unit='bytes'>53687091200</allocation> + <target> + <path>sheepdog:myvol</path> + <format type='unknown'/> + <permissions> + <mode>00</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</volume></pre> <h3>Example disk attachment</h3> <p>Sheepdog images can be attached to Qemu guests. @@ -707,14 +707,14 @@ subdirectory relative to the gluster volume to use instead of the top-level directory of the volume.</p> <pre> - <pool type="gluster"> - <name>myglusterpool</name> - <source> - <name>volname</name> - <host name='localhost'/> - <dir path='/'/> - </source> - </pool></pre> +<pool type="gluster"> + <name>myglusterpool</name> + <source> + <name>volname</name> + <host name='localhost'/> + <dir path='/'/> + </source> +</pool></pre> <h3>Example volume output</h3> <p>Libvirt storage volumes associated with a gluster pool @@ -726,14 +726,14 @@ URI of the volume but it may be changed to a UUID of the volume in the future.</p> <pre> - <volume> - <name>myfile</name> - <key>gluster://localhost/volname/myfile</key> - <source> - </source> - <capacity unit='bytes'>53687091200</capacity> - <allocation unit='bytes'>53687091200</allocation> - </volume></pre> +<volume> + <name>myfile</name> + <key>gluster://localhost/volname/myfile</key> + <source> + </source> + <capacity unit='bytes'>53687091200</capacity> + <allocation unit='bytes'>53687091200</allocation> +</volume></pre> <h3>Example disk attachment</h3> <p>Files within a gluster volume can be attached to Qemu guests. @@ -773,14 +773,14 @@ <h3>Example pool input</h3> <pre> - <pool type="zfs"> - <name>myzfspool</name> - <source> - <name>zpoolname</name> - <device path="/dev/ada1"/> - <device path="/dev/ada2"/> - </source> - </pool></pre> +<pool type="zfs"> + <name>myzfspool</name> + <source> + <name>zpoolname</name> + <device path="/dev/ada1"/> + <device path="/dev/ada2"/> + </source> +</pool></pre> <h3>Valid pool format types</h3> <p> -- 2.8.4
On Mon, Nov 14, 2016 at 10:33:46AM +0100, Michal Privoznik wrote:
Whilst reviewing patches that reworked our web page I've noticed couple of overflows in some example XMLs. For instance:
http://libvirt.org/formatnetwork.html#elementsAddress
The problem is we have very long lines sometimes. And to make it worse we have a lot of spaces at the beginning of some <pre/> sections. Remove them.
ACK to all Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|
participants (2)
-
Daniel P. Berrange -
Michal Privoznik