--- docs/drvlxc.html.in | 80 +++++++++--------- docs/drvone.html.in | 89 +++++++++++---------- docs/drvopenvz.html.in | 22 +++--- docs/drvqemu.html.in | 48 ++++++------ docs/drvtest.html.in | 16 ++-- docs/drvuml.html.in | 22 +++--- docs/drvvbox.html.in | 194 ++++++++++++++++++++++----------------------- docs/drvxen.html.in | 22 +++--- docs/formatdomain.html.in | 3 +- docs/storage.html.in | 18 ++--- 10 files changed, 253 insertions(+), 261 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index f67b7d0..cfcfdab 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -13,24 +13,24 @@ start it using <p></p> <pre> &lt;domain type='lxc'&gt; - &lt;name&gt;vm1&lt;/name&gt; - &lt;memory&gt;500000&lt;/memory&gt; - &lt;os&gt; - &lt;type&gt;exe&lt;/type&gt; - &lt;init&gt;/bin/sh&lt;/init&gt; - &lt;/os&gt; - &lt;vcpu&gt;1&lt;/vcpu&gt; - &lt;clock offset='utc'/&gt; - &lt;on_poweroff&gt;destroy&lt;/on_poweroff&gt; - &lt;on_reboot&gt;restart&lt;/on_reboot&gt; - &lt;on_crash&gt;destroy&lt;/on_crash&gt; - &lt;devices&gt; - &lt;emulator&gt;/usr/libexec/libvirt_lxc&lt;/emulator&gt; - &lt;interface type='network'&gt; - &lt;source network='default'/&gt; - &lt;/interface&gt; - &lt;console type='pty' /&gt; - &lt;/devices&gt; + &lt;name&gt;vm1&lt;/name&gt; + &lt;memory&gt;500000&lt;/memory&gt; + &lt;os&gt; + &lt;type&gt;exe&lt;/type&gt; + &lt;init&gt;/bin/sh&lt;/init&gt; + &lt;/os&gt; + &lt;vcpu&gt;1&lt;/vcpu&gt; + &lt;clock offset='utc'/&gt; + &lt;on_poweroff&gt;destroy&lt;/on_poweroff&gt; + &lt;on_reboot&gt;restart&lt;/on_reboot&gt; + &lt;on_crash&gt;destroy&lt;/on_crash&gt; + &lt;devices&gt; + &lt;emulator&gt;/usr/libexec/libvirt_lxc&lt;/emulator&gt; + &lt;interface type='network'&gt; + &lt;source network='default'/&gt; + &lt;/interface&gt; + &lt;console type='pty' /&gt; + &lt;/devices&gt; &lt;/domain&gt; </pre> @@ -42,28 +42,28 @@ debootstrap, whatever) under /opt/vm-1-root: <p></p> <pre> &lt;domain type='lxc'&gt; - &lt;name&gt;vm1&lt;/name&gt; - &lt;memory&gt;32768&lt;/memory&gt; - &lt;os&gt; - &lt;type&gt;exe&lt;/type&gt; - &lt;init&gt;/init&lt;/init&gt; - &lt;/os&gt; - &lt;vcpu&gt;1&lt;/vcpu&gt; - &lt;clock offset='utc'/&gt; - &lt;on_poweroff&gt;destroy&lt;/on_poweroff&gt; - &lt;on_reboot&gt;restart&lt;/on_reboot&gt; - &lt;on_crash&gt;destroy&lt;/on_crash&gt; - &lt;devices&gt; - &lt;emulator&gt;/usr/libexec/libvirt_lxc&lt;/emulator&gt; - &lt;filesystem type='mount'&gt; - &lt;source dir='/opt/vm-1-root'/&gt; - &lt;target dir='/'/&gt; - &lt;/filesystem&gt; - &lt;interface type='network'&gt; - &lt;source network='default'/&gt; - &lt;/interface&gt; - &lt;console type='pty' /&gt; - &lt;/devices&gt; + &lt;name&gt;vm1&lt;/name&gt; + &lt;memory&gt;32768&lt;/memory&gt; + &lt;os&gt; + &lt;type&gt;exe&lt;/type&gt; + &lt;init&gt;/init&lt;/init&gt; + &lt;/os&gt; + &lt;vcpu&gt;1&lt;/vcpu&gt; + &lt;clock offset='utc'/&gt; + &lt;on_poweroff&gt;destroy&lt;/on_poweroff&gt; + &lt;on_reboot&gt;restart&lt;/on_reboot&gt; + &lt;on_crash&gt;destroy&lt;/on_crash&gt; + &lt;devices&gt; + &lt;emulator&gt;/usr/libexec/libvirt_lxc&lt;/emulator&gt; + &lt;filesystem type='mount'&gt; + &lt;source dir='/opt/vm-1-root'/&gt; + &lt;target dir='/'/&gt; + &lt;/filesystem&gt; + &lt;interface type='network'&gt; + &lt;source network='default'/&gt; + &lt;/interface&gt; + &lt;console type='pty' /&gt; + &lt;/devices&gt; &lt;/domain&gt; </pre> diff --git a/docs/drvone.html.in b/docs/drvone.html.in index 1745be1..036c0c7 100644 --- a/docs/drvone.html.in +++ b/docs/drvone.html.in @@ -27,12 +27,13 @@ tools and VM description files.</p> <p>The Uri of the driver protocol is "one". Some example connection Uris for the driver are: </p> -<pre> one:/// (local access) - one+unix:/// (local access) - one://example.com/ (remote access) - one+tcp://example.com/ (remote access, SASl/Kerberos) - one+ssh://user@example.com/ (remote access, SSH tunnelled) - </pre> +<pre> +one:/// (local access) +one+unix:/// (local access) +one://example.com/ (remote access) +one+tcp://example.com/ (remote access, SASl/Kerberos) +one+ssh://user@example.com/ (remote access, SSH tunnelled) +</pre> <h2> <a name="xmlconfig"></a>Example domain XML config</h2> <p>There are some limitations on the XML attributes that may be @@ -42,51 +43,51 @@ driver:</p> <h3>Paravirtualized guest direct kernel boot </h3> -<pre> &lt;domain type='one'&gt; - &lt;name&gt;vm01&lt;/name&gt; - &lt;memory&gt;32768&lt;/memory&gt; - &lt;vcpu&gt;1&lt;/vcpu&gt; +<pre> +&lt;domain type='one'&gt; + &lt;name&gt;vm01&lt;/name&gt; + &lt;memory&gt;32768&lt;/memory&gt; + &lt;vcpu&gt;1&lt;/vcpu&gt; - &lt;os&gt; - &lt;type&gt;linux&lt;/type&gt; - &lt;kernel&gt;/boot/vmlinuz-2.6.24-17-xen&lt;/kernel&gt; - &lt;initrd&gt;/boot/initrd.img-2.6.24-17-xen&lt;/initrd&gt; - &lt;cmdline&gt;&lt;/cmdline&gt; - &lt;root&gt;sda1&lt;/root&gt; - &lt;/os&gt; + &lt;os&gt; + &lt;type&gt;linux&lt;/type&gt; + &lt;kernel&gt;/boot/vmlinuz-2.6.24-17-xen&lt;/kernel&gt; + &lt;initrd&gt;/boot/initrd.img-2.6.24-17-xen&lt;/initrd&gt; + &lt;cmdline&gt;&lt;/cmdline&gt; + &lt;root&gt;sda1&lt;/root&gt; + &lt;/os&gt; - &lt;devices&gt; + &lt;devices&gt; + &lt;disk type='file' device='disk'&gt; + &lt;source file='/images/sgehosts/01/disk.img'/&gt; + &lt;target dev='sda1'/&gt; + &lt;/disk&gt; - &lt;disk type='file' device='disk'&gt; - &lt;source file='/images/sgehosts/01/disk.img'/&gt; - &lt;target dev='sda1'/&gt; - &lt;/disk&gt; + &lt;disk type='file' device='disk'&gt; + &lt;source file='/images/sgehosts/01/swap.img'/&gt; + &lt;target dev='sda2'/&gt; + &lt;/disk&gt; - &lt;disk type='file' device='disk'&gt; - &lt;source file='/images/sgehosts/01/swap.img'/&gt; - &lt;target dev='sda2'/&gt; - &lt;/disk&gt; + &lt;disk type='file' device='cdrom'&gt; + &lt;source file='/images/iso/cdrom.iso'/&gt; + &lt;target dev='hdc'/&gt; + &lt;readonly/&gt; + &lt;/disk&gt; - &lt;disk type='file' device='cdrom'&gt; - &lt;source file='/images/iso/cdrom.iso'/&gt; - &lt;target dev='hdc'/&gt; - &lt;readonly/&gt; - &lt;/disk&gt; + &lt;!--BRIDGE--&gt; + &lt;interface type='bridge'&gt; + &lt;source bridge='eth0'/&gt; + &lt;mac address='00:16:3e:5d:c7:9e'/&gt; + &lt;/interface&gt; - &lt;!--BRIDGE--&gt; - &lt;interface type='bridge'&gt; - &lt;source bridge='eth0'/&gt; - &lt;mac address='00:16:3e:5d:c7:9e'/&gt; - &lt;/interface&gt; - - &lt;!--ONE Network--&gt; - &lt;interface type='network'&gt; - &lt;source network='onenetwork'/&gt; - &lt;/interface&gt; - &lt;/devices&gt; - &lt;/domain&gt; - </pre> + &lt;!--ONE Network--&gt; + &lt;interface type='network'&gt; + &lt;source network='onenetwork'/&gt; + &lt;/interface&gt; + &lt;/devices&gt; +&lt;/domain&gt; +</pre> <p> <b>Note:</b> The "&lt;interface type='network'&gt;" will attach the interface to a previously configured network (named diff --git a/docs/drvopenvz.html.in b/docs/drvopenvz.html.in index b2beadb..e446b1a 100644 --- a/docs/drvopenvz.html.in +++ b/docs/drvopenvz.html.in @@ -19,13 +19,13 @@ the libvirt driver are: </p> - <pre> - openvz:///system (local access) - openvz+unix:///system (local access) - openvz://example.com/system (remote access, TLS/x509) - openvz+tcp://example.com/system (remote access, SASl/Kerberos) - openvz+ssh://root@example.com/system (remote access, SSH tunnelled) - </pre> +<pre> +openvz:///system (local access) +openvz+unix:///system (local access) +openvz://example.com/system (remote access, TLS/x509) +openvz+tcp://example.com/system (remote access, SASl/Kerberos) +openvz+ssh://root@example.com/system (remote access, SSH tunnelled) +</pre> <h2>Notes on bridged networking</h2> @@ -60,10 +60,10 @@ must be created containing </p> - <pre> +<pre> #!/bin/bash EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" - </pre> +</pre> <p> The host OS is now ready to allow bridging of guest containers, which @@ -83,7 +83,7 @@ EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" matches the templates known to OpenVZ tools. </p> - <pre> +<pre> &lt;domain type='openvz' id='104'&gt; &lt;name&gt;104&lt;/name&gt; &lt;uuid&gt;86c12009-e591-a159-6e9f-91d18b85ef78&lt;/uuid&gt; @@ -104,7 +104,7 @@ EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" &lt;/interface&gt; &lt;/devices&gt; &lt;/domain&gt; - </pre> +</pre> </body> </html> diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 996ed3e..c5c826c 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -43,16 +43,16 @@ is "qemu". Some example conection URIs for the libvirt driver are: </p> - <pre> - qemu:///session (local access to per-user instance) - qemu+unix:///session (local access to per-user instance) - - qemu:///system (local access to system instance) - qemu+unix:///system (local access to system instance) - qemu://example.com/system (remote access, TLS/x509) - qemu+tcp://example.com/system (remote access, SASl/Kerberos) - qemu+ssh://root@example.com/system (remote access, SSH tunnelled) - </pre> +<pre> +qemu:///session (local access to per-user instance) +qemu+unix:///session (local access to per-user instance) + +qemu:///system (local access to system instance) +qemu+unix:///system (local access to system instance) +qemu://example.com/system (remote access, TLS/x509) +qemu+tcp://example.com/system (remote access, SASl/Kerberos) +qemu+ssh://root@example.com/system (remote access, SSH tunnelled) +</pre> <h2><a name="security">Driver security architecture</a></h2> @@ -167,7 +167,7 @@ parent directories </p> <pre> - chmod o+x /path/to/directory +chmod o+x /path/to/directory </pre> <p> In particular note that if using the "system" instance @@ -383,12 +383,12 @@ The list of shared devices a guest is allowed access to is </p> - <pre> - /dev/null, /dev/full, /dev/zero, - /dev/random, /dev/urandom, - /dev/ptmx, /dev/kvm, /dev/kqemu, - /dev/rtc, /dev/hpet, /dev/net/tun - </pre> +<pre> +/dev/null, /dev/full, /dev/zero, +/dev/random, /dev/urandom, +/dev/ptmx, /dev/kvm, /dev/kqemu, +/dev/rtc, /dev/hpet, /dev/net/tun +</pre> <p> In the event of unanticipated needs arising, this can be customized @@ -397,10 +397,10 @@ should be run as root, prior to starting libvirtd </p> - <pre> - mkdir /dev/cgroup - mount -t cgroup none /dev/cgroup -o devices - </pre> +<pre> +mkdir /dev/cgroup +mount -t cgroup none /dev/cgroup -o devices +</pre> <p> libvirt will then place each virtual machine in a cgroup at @@ -430,6 +430,7 @@ LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 \ /dev/HostVG/QEMUGuest1 -net none -serial none \ -parallel none -usb EOF + $ virsh domxml-from-native qemu-argv demo.args &lt;domain type='qemu'&gt; &lt;uuid&gt;00000000-0000-0000-0000-000000000000&lt;/uuid&gt; @@ -452,7 +453,7 @@ $ virsh domxml-from-native qemu-argv demo.args &lt;/disk&gt; &lt;/devices&gt; &lt;/domain&gt; - </pre> +</pre> <p>NB, don't include the literral \ in the args, put everything on one line</p> @@ -488,6 +489,7 @@ $ virsh domxml-from-native qemu-argv demo.args &lt;/devices&gt; &lt;/domain&gt; EOF + $ virsh domxml-to-native qemu-argv demo.xml LC_ALL=C PATH=/usr/bin:/bin HOME=/home/test \ USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ @@ -495,7 +497,7 @@ $ virsh domxml-to-native qemu-argv demo.xml -monitor pty -no-acpi -boot c -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -net none \ -serial none -parallel none -usb - </pre> +</pre> <h2><a name="xmlconfig">Example domain XML config</a></h2> diff --git a/docs/drvtest.html.in b/docs/drvtest.html.in index 0547fbb..b5814c3 100644 --- a/docs/drvtest.html.in +++ b/docs/drvtest.html.in @@ -12,14 +12,14 @@ for the libvirt driver are: </p> - <pre> - test:///default (local access, default config) - test:///path/to/driver/config.xml (local access, custom config) - test+unix:///default (local access, default config, via daemon) - test://example.com/default (remote access, TLS/x509) - test+tcp://example.com/default (remote access, SASl/Kerberos) - test+ssh://root@example.com/default (remote access, SSH tunnelled) - </pre> +<pre> +test:///default (local access, default config) +test:///path/to/driver/config.xml (local access, custom config) +test+unix:///default (local access, default config, via daemon) +test://example.com/default (remote access, TLS/x509) +test+tcp://example.com/default (remote access, SASl/Kerberos) +test+ssh://root@example.com/default (remote access, SSH tunnelled) +</pre> </body> </html> diff --git a/docs/drvuml.html.in b/docs/drvuml.html.in index 25a417f..9e5db95 100644 --- a/docs/drvuml.html.in +++ b/docs/drvuml.html.in @@ -24,16 +24,16 @@ URIs are </p> - <pre> - uml:///session (local access to per-user instance) - uml+unix:///session (local access to per-user instance) +<pre> +uml:///session (local access to per-user instance) +uml+unix:///session (local access to per-user instance) - uml:///system (local access to system instance) - uml+unix:///system (local access to system instance) - uml://example.com/system (remote access, TLS/x509) - uml+tcp://example.com/system (remote access, SASl/Kerberos) - uml+ssh://root@example.com/system (remote access, SSH tunnelled) - </pre> +uml:///system (local access to system instance) +uml+unix:///system (local access to system instance) +uml://example.com/system (remote access, TLS/x509) +uml+tcp://example.com/system (remote access, SASl/Kerberos) +uml+ssh://root@example.com/system (remote access, SSH tunnelled) +</pre> <h2>Example XML configuration</h2> @@ -58,7 +58,7 @@ thus accessible with "virsh console" or equivalent tools </p> - <pre> +<pre> &lt;domain type='uml'&gt; &lt;name&gt;demo&lt;/name&gt; &lt;uuid&gt;b4433fc2-a22e-ffb3-0a3d-9c173b395800&lt;/uuid&gt; @@ -77,6 +77,6 @@ &lt;console type='pty'/&gt; &lt;/devices&gt; &lt;/domain&gt; - </pre> +</pre> </body> </html> diff --git a/docs/drvvbox.html.in b/docs/drvvbox.html.in index 73372f1..ef55757 100644 --- a/docs/drvvbox.html.in +++ b/docs/drvvbox.html.in @@ -13,107 +13,105 @@ The uri of the driver protocol is "vbox". Some example connection URIs for the driver are: </p> - <pre> - vbox:///session (local access to per-user instance) - vbox+unix:///session (local access to per-user instance) - vbox+tcp://user@example.com/session (remote access, SASl/Kerberos) - vbox+ssh://user@example.com/session (remote access, SSH tunnelled) - </pre> +<pre> +vbox:///session (local access to per-user instance) +vbox+unix:///session (local access to per-user instance) +vbox+tcp://user@example.com/session (remote access, SASl/Kerberos) +vbox+ssh://user@example.com/session (remote access, SSH tunnelled) +</pre> <h2><a name="xmlconfig">Example domain XML config</a></h2> - <pre> - &lt;domain type='vbox'&gt; - &lt;name&gt;vbox&lt;/name&gt; - &lt;uuid&gt;4dab22b31d52d8f32516782e98ab3fa0&lt;/uuid&gt; - - &lt;os&gt; - &lt;type&gt;hvm&lt;/type&gt; - &lt;boot dev='cdrom'/&gt; - &lt;boot dev='hd'/&gt; - &lt;boot dev='fd'/&gt; - &lt;boot dev='network'/&gt; - &lt;/os&gt; - - &lt;memory&gt;654321&lt;/memory&gt; - &lt;vcpu&gt;1&lt;/vcpu&gt; - - &lt;features&gt; - &lt;pae/&gt; - &lt;acpi/&gt; - &lt;apic/&gt; - &lt;/features&gt; - - &lt;devices&gt; - &lt;disk type='file' device='cdrom'&gt; - &lt;source file='/home/user/Downloads/slax-6.0.9.iso'/&gt; - &lt;target dev='hdc'/&gt; - &lt;readonly/&gt; - &lt;/disk&gt; - - &lt;disk type='file' device='disk'&gt; - &lt;source file='/home/user/tmp/vbox.vdi'/&gt; - &lt;target dev='hdd'/&gt; - &lt;/disk&gt; - - &lt;disk type='file' device='floppy'&gt; - &lt;source file='/home/user/tmp/WIN98C.IMG'/&gt; - &lt;target dev='fda'/&gt; - &lt;/disk&gt; - - &lt;!--BRIDGE--&gt; - &lt;interface type='bridge'&gt; - &lt;source bridge='eth0'/&gt; - &lt;mac address='00:16:3e:5d:c7:9e'/&gt; - &lt;model type='am79c973'/&gt; - &lt;/interface&gt; - - &lt;!--NAT--&gt; - &lt;interface type='user'&gt; - &lt;mac address='56:16:3e:5d:c7:9e'/&gt; - &lt;model type='82540eM'/&gt; - &lt;/interface&gt; - - &lt;sound model='sb16'/&gt; - - &lt;parallel type='dev'&gt; - &lt;source path='/dev/pts/1'/&gt; - &lt;target port='0'/&gt; - &lt;/parallel&gt; - - &lt;parallel type='dev'&gt; - &lt;source path='/dev/pts/2'/&gt; - &lt;target port='1'/&gt; - &lt;/parallel&gt; - - &lt;serial type="dev"&gt; - &lt;source path="/dev/ttyS0"/&gt; - &lt;target port="0"/&gt; - &lt;/serial&gt; - - &lt;serial type="pipe"&gt; - &lt;source path="/tmp/serial.txt"/&gt; - &lt;target port="1"/&gt; - &lt;/serial&gt; - - &lt;hostdev mode='subsystem' type='usb'&gt; - &lt;source&gt; - &lt;vendor id='0x1234'/&gt; - &lt;product id='0xbeef'/&gt; - &lt;/source&gt; - &lt;/hostdev&gt; - - &lt;hostdev mode='subsystem' type='usb'&gt; - &lt;source&gt; - &lt;vendor id='0x4321'/&gt; - &lt;product id='0xfeeb'/&gt; - &lt;/source&gt; - &lt;/hostdev&gt; - - &lt;/devices&gt; - - &lt;/domain&gt; - </pre> +<pre> +&lt;domain type='vbox'&gt; + &lt;name&gt;vbox&lt;/name&gt; + &lt;uuid&gt;4dab22b31d52d8f32516782e98ab3fa0&lt;/uuid&gt; + + &lt;os&gt; + &lt;type&gt;hvm&lt;/type&gt; + &lt;boot dev='cdrom'/&gt; + &lt;boot dev='hd'/&gt; + &lt;boot dev='fd'/&gt; + &lt;boot dev='network'/&gt; + &lt;/os&gt; + + &lt;memory&gt;654321&lt;/memory&gt; + &lt;vcpu&gt;1&lt;/vcpu&gt; + + &lt;features&gt; + &lt;pae/&gt; + &lt;acpi/&gt; + &lt;apic/&gt; + &lt;/features&gt; + + &lt;devices&gt; + &lt;disk type='file' device='cdrom'&gt; + &lt;source file='/home/user/Downloads/slax-6.0.9.iso'/&gt; + &lt;target dev='hdc'/&gt; + &lt;readonly/&gt; + &lt;/disk&gt; + + &lt;disk type='file' device='disk'&gt; + &lt;source file='/home/user/tmp/vbox.vdi'/&gt; + &lt;target dev='hdd'/&gt; + &lt;/disk&gt; + + &lt;disk type='file' device='floppy'&gt; + &lt;source file='/home/user/tmp/WIN98C.IMG'/&gt; + &lt;target dev='fda'/&gt; + &lt;/disk&gt; + + &lt;!--BRIDGE--&gt; + &lt;interface type='bridge'&gt; + &lt;source bridge='eth0'/&gt; + &lt;mac address='00:16:3e:5d:c7:9e'/&gt; + &lt;model type='am79c973'/&gt; + &lt;/interface&gt; + + &lt;!--NAT--&gt; + &lt;interface type='user'&gt; + &lt;mac address='56:16:3e:5d:c7:9e'/&gt; + &lt;model type='82540eM'/&gt; + &lt;/interface&gt; + + &lt;sound model='sb16'/&gt; + + &lt;parallel type='dev'&gt; + &lt;source path='/dev/pts/1'/&gt; + &lt;target port='0'/&gt; + &lt;/parallel&gt; + + &lt;parallel type='dev'&gt; + &lt;source path='/dev/pts/2'/&gt; + &lt;target port='1'/&gt; + &lt;/parallel&gt; + + &lt;serial type="dev"&gt; + &lt;source path="/dev/ttyS0"/&gt; + &lt;target port="0"/&gt; + &lt;/serial&gt; + + &lt;serial type="pipe"&gt; + &lt;source path="/tmp/serial.txt"/&gt; + &lt;target port="1"/&gt; + &lt;/serial&gt; + + &lt;hostdev mode='subsystem' type='usb'&gt; + &lt;source&gt; + &lt;vendor id='0x1234'/&gt; + &lt;product id='0xbeef'/&gt; + &lt;/source&gt; + &lt;/hostdev&gt; + + &lt;hostdev mode='subsystem' type='usb'&gt; + &lt;source&gt; + &lt;vendor id='0x4321'/&gt; + &lt;product id='0xfeeb'/&gt; + &lt;/source&gt; + &lt;/hostdev&gt; + &lt;/devices&gt; +&lt;/domain&gt; +</pre> </body> </html> diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in index fbad477..a6f0e57 100644 --- a/docs/drvxen.html.in +++ b/docs/drvxen.html.in @@ -54,13 +54,13 @@ the libvirt driver are: </p> - <pre> - xen:/// (local access, direct) - xen+unix:/// (local access, via daemon) - xen://example.com/ (remote access, TLS/x509) - xen+tcp://example.com/ (remote access, SASl/Kerberos) - xen+ssh://root@example.com/ (remote access, SSH tunnelled) - </pre> +<pre> +xen:/// (local access, direct) +xen+unix:/// (local access, via daemon) +xen://example.com/ (remote access, TLS/x509) +xen+tcp://example.com/ (remote access, SASl/Kerberos) +xen+ssh://root@example.com/ (remote access, SSH tunnelled) +</pre> <h2><a name="imex">Import and export of libvirt domain XML configs</a></h2> @@ -114,8 +114,7 @@ &lt;input type='mouse' bus='xen'/&gt; &lt;graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/&gt; &lt;/devices&gt; -&lt;/domain&gt; - </pre> +&lt;/domain&gt;</pre> <h3><a name="xmlexport">Converting from domain XML to XM config files</a></h3> @@ -125,7 +124,7 @@ format. </p> - <pre># virsh -c xen:/// domxml-to-native xen-xm rhel5pv.xml + <pre>$ virsh -c xen:/// domxml-to-native xen-xm rhel5pv.xml name = "rhel5pv" uuid = "8f07fe28-753f-2729-d76d-bdbd892f949a" maxmem = 2500 @@ -143,8 +142,7 @@ vnc = 1 vncunused = 1 vnclisten = "0.0.0.0" disk = [ "tap:aio:/var/lib/xen/images/rhel5pv.img,xvda,w", "tap:qcow:/root/qcow1-xen.img,xvdd,w" ] -vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ] - </pre> +vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]</pre> <h2><a name="xmlconfig">Example domain XML config</a></h2> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 52889af..05047d3 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -750,8 +750,7 @@ qemu-kvm -net nic,model=? /dev/null &lt;video type='vga' nvram='8192' heads='1'&gt; &lt;acceleration accel3d='yes' accel3d='yes' /&gt; &lt;/video&gt; - ... - </pre> + ...</pre> <dl> <dt><code>video</code></dt> diff --git a/docs/storage.html.in b/docs/storage.html.in index 2d48a59..904fc7c 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -45,8 +45,7 @@ libvirt. &lt;target&gt; &lt;path&gt;/var/lib/virt/images&lt;/path&gt; &lt;/target&gt; - &lt;/pool&gt; - </pre> + &lt;/pool&gt;</pre> <h3>Valid pool format types</h3> <p> @@ -101,8 +100,7 @@ libvirt. &lt;target&gt; &lt;path&gt;/var/lib/virt/images&lt;/path&gt; &lt;/target&gt; - &lt;/pool&gt; - </pre> + &lt;/pool&gt;</pre> <h3>Valid pool format types</h3> <p> @@ -172,8 +170,7 @@ libvirt. &lt;target&gt; &lt;path&gt;/var/lib/virt/images&lt;/path&gt; &lt;/target&gt; - &lt;/pool&gt; - </pre> + &lt;/pool&gt;</pre> <h3>Valid pool format types</h3> <p> @@ -215,8 +212,7 @@ libvirt. &lt;target&gt; &lt;path&gt;/dev/HostVG&lt;/path&gt; &lt;/target&gt; - &lt;/pool&gt; - </pre> + &lt;/pool&gt;</pre> <h3>Valid pool format types</h3> <p> @@ -248,8 +244,7 @@ libvirt. &lt;target&gt; &lt;path&gt;/dev&lt;/path&gt; &lt;/target&gt; - &lt;/pool&gt; - </pre> + &lt;/pool&gt;</pre> <h3>Valid pool format types</h3> <p> @@ -338,8 +333,7 @@ libvirt. &lt;target&gt; &lt;path&gt;/dev/disk/by-path&lt;/path&gt; &lt;/target&gt; - &lt;/pool&gt; - </pre> + &lt;/pool&gt;</pre> <h3>Valid pool format types</h3> <p> -- 1.6.0.4