--- 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> <domain type='lxc'> - <name>vm1</name> - <memory>500000</memory> - <os> - <type>exe</type> - <init>/bin/sh</init> - </os> - <vcpu>1</vcpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/libexec/libvirt_lxc</emulator> - <interface type='network'> - <source network='default'/> - </interface> - <console type='pty' /> - </devices> + <name>vm1</name> + <memory>500000</memory> + <os> + <type>exe</type> + <init>/bin/sh</init> + </os> + <vcpu>1</vcpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <interface type='network'> + <source network='default'/> + </interface> + <console type='pty' /> + </devices> </domain> </pre> @@ -42,28 +42,28 @@ debootstrap, whatever) under /opt/vm-1-root: <p></p> <pre> <domain type='lxc'> - <name>vm1</name> - <memory>32768</memory> - <os> - <type>exe</type> - <init>/init</init> - </os> - <vcpu>1</vcpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/libexec/libvirt_lxc</emulator> - <filesystem type='mount'> - <source dir='/opt/vm-1-root'/> - <target dir='/'/> - </filesystem> - <interface type='network'> - <source network='default'/> - </interface> - <console type='pty' /> - </devices> + <name>vm1</name> + <memory>32768</memory> + <os> + <type>exe</type> + <init>/init</init> + </os> + <vcpu>1</vcpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount'> + <source dir='/opt/vm-1-root'/> + <target dir='/'/> + </filesystem> + <interface type='network'> + <source network='default'/> + </interface> + <console type='pty' /> + </devices> </domain> </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> <domain type='one'> - <name>vm01</name> - <memory>32768</memory> - <vcpu>1</vcpu> +<pre> +<domain type='one'> + <name>vm01</name> + <memory>32768</memory> + <vcpu>1</vcpu> - <os> - <type>linux</type> - <kernel>/boot/vmlinuz-2.6.24-17-xen</kernel> - <initrd>/boot/initrd.img-2.6.24-17-xen</initrd> - <cmdline></cmdline> - <root>sda1</root> - </os> + <os> + <type>linux</type> + <kernel>/boot/vmlinuz-2.6.24-17-xen</kernel> + <initrd>/boot/initrd.img-2.6.24-17-xen</initrd> + <cmdline></cmdline> + <root>sda1</root> + </os> - <devices> + <devices> + <disk type='file' device='disk'> + <source file='/images/sgehosts/01/disk.img'/> + <target dev='sda1'/> + </disk> - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/disk.img'/> - <target dev='sda1'/> - </disk> + <disk type='file' device='disk'> + <source file='/images/sgehosts/01/swap.img'/> + <target dev='sda2'/> + </disk> - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/swap.img'/> - <target dev='sda2'/> - </disk> + <disk type='file' device='cdrom'> + <source file='/images/iso/cdrom.iso'/> + <target dev='hdc'/> + <readonly/> + </disk> - <disk type='file' device='cdrom'> - <source file='/images/iso/cdrom.iso'/> - <target dev='hdc'/> - <readonly/> - </disk> + <!--BRIDGE--> + <interface type='bridge'> + <source bridge='eth0'/> + <mac address='00:16:3e:5d:c7:9e'/> + </interface> - <!--BRIDGE--> - <interface type='bridge'> - <source bridge='eth0'/> - <mac address='00:16:3e:5d:c7:9e'/> - </interface> - - <!--ONE Network--> - <interface type='network'> - <source network='onenetwork'/> - </interface> - </devices> - </domain> - </pre> + <!--ONE Network--> + <interface type='network'> + <source network='onenetwork'/> + </interface> + </devices> +</domain> +</pre> <p> <b>Note:</b> The "<interface type='network'>" 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> <domain type='openvz' id='104'> <name>104</name> <uuid>86c12009-e591-a159-6e9f-91d18b85ef78</uuid> @@ -104,7 +104,7 @@ EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" </interface> </devices> </domain> - </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 <domain type='qemu'> <uuid>00000000-0000-0000-0000-000000000000</uuid> @@ -452,7 +453,7 @@ $ virsh domxml-from-native qemu-argv demo.args </disk> </devices> </domain> - </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 </devices> </domain> 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> <domain type='uml'> <name>demo</name> <uuid>b4433fc2-a22e-ffb3-0a3d-9c173b395800</uuid> @@ -77,6 +77,6 @@ <console type='pty'/> </devices> </domain> - </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> - <domain type='vbox'> - <name>vbox</name> - <uuid>4dab22b31d52d8f32516782e98ab3fa0</uuid> - - <os> - <type>hvm</type> - <boot dev='cdrom'/> - <boot dev='hd'/> - <boot dev='fd'/> - <boot dev='network'/> - </os> - - <memory>654321</memory> - <vcpu>1</vcpu> - - <features> - <pae/> - <acpi/> - <apic/> - </features> - - <devices> - <disk type='file' device='cdrom'> - <source file='/home/user/Downloads/slax-6.0.9.iso'/> - <target dev='hdc'/> - <readonly/> - </disk> - - <disk type='file' device='disk'> - <source file='/home/user/tmp/vbox.vdi'/> - <target dev='hdd'/> - </disk> - - <disk type='file' device='floppy'> - <source file='/home/user/tmp/WIN98C.IMG'/> - <target dev='fda'/> - </disk> - - <!--BRIDGE--> - <interface type='bridge'> - <source bridge='eth0'/> - <mac address='00:16:3e:5d:c7:9e'/> - <model type='am79c973'/> - </interface> - - <!--NAT--> - <interface type='user'> - <mac address='56:16:3e:5d:c7:9e'/> - <model type='82540eM'/> - </interface> - - <sound model='sb16'/> - - <parallel type='dev'> - <source path='/dev/pts/1'/> - <target port='0'/> - </parallel> - - <parallel type='dev'> - <source path='/dev/pts/2'/> - <target port='1'/> - </parallel> - - <serial type="dev"> - <source path="/dev/ttyS0"/> - <target port="0"/> - </serial> - - <serial type="pipe"> - <source path="/tmp/serial.txt"/> - <target port="1"/> - </serial> - - <hostdev mode='subsystem' type='usb'> - <source> - <vendor id='0x1234'/> - <product id='0xbeef'/> - </source> - </hostdev> - - <hostdev mode='subsystem' type='usb'> - <source> - <vendor id='0x4321'/> - <product id='0xfeeb'/> - </source> - </hostdev> - - </devices> - - </domain> - </pre> +<pre> +<domain type='vbox'> + <name>vbox</name> + <uuid>4dab22b31d52d8f32516782e98ab3fa0</uuid> + + <os> + <type>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <boot dev='fd'/> + <boot dev='network'/> + </os> + + <memory>654321</memory> + <vcpu>1</vcpu> + + <features> + <pae/> + <acpi/> + <apic/> + </features> + + <devices> + <disk type='file' device='cdrom'> + <source file='/home/user/Downloads/slax-6.0.9.iso'/> + <target dev='hdc'/> + <readonly/> + </disk> + + <disk type='file' device='disk'> + <source file='/home/user/tmp/vbox.vdi'/> + <target dev='hdd'/> + </disk> + + <disk type='file' device='floppy'> + <source file='/home/user/tmp/WIN98C.IMG'/> + <target dev='fda'/> + </disk> + + <!--BRIDGE--> + <interface type='bridge'> + <source bridge='eth0'/> + <mac address='00:16:3e:5d:c7:9e'/> + <model type='am79c973'/> + </interface> + + <!--NAT--> + <interface type='user'> + <mac address='56:16:3e:5d:c7:9e'/> + <model type='82540eM'/> + </interface> + + <sound model='sb16'/> + + <parallel type='dev'> + <source path='/dev/pts/1'/> + <target port='0'/> + </parallel> + + <parallel type='dev'> + <source path='/dev/pts/2'/> + <target port='1'/> + </parallel> + + <serial type="dev"> + <source path="/dev/ttyS0"/> + <target port="0"/> + </serial> + + <serial type="pipe"> + <source path="/tmp/serial.txt"/> + <target port="1"/> + </serial> + + <hostdev mode='subsystem' type='usb'> + <source> + <vendor id='0x1234'/> + <product id='0xbeef'/> + </source> + </hostdev> + + <hostdev mode='subsystem' type='usb'> + <source> + <vendor id='0x4321'/> + <product id='0xfeeb'/> + </source> + </hostdev> + </devices> +</domain> +</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 @@ <input type='mouse' bus='xen'/> <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> </devices> -</domain> - </pre> +</domain></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 <video type='vga' nvram='8192' heads='1'> <acceleration accel3d='yes' accel3d='yes' /> </video> - ... - </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. <target> <path>/var/lib/virt/images</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -101,8 +100,7 @@ libvirt. <target> <path>/var/lib/virt/images</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -172,8 +170,7 @@ libvirt. <target> <path>/var/lib/virt/images</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -215,8 +212,7 @@ libvirt. <target> <path>/dev/HostVG</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -248,8 +244,7 @@ libvirt. <target> <path>/dev</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -338,8 +333,7 @@ libvirt. <target> <path>/dev/disk/by-path</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> -- 1.6.0.4