openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: Make sure all XML use " for quoting 

This is what libxml outputs with, and it's going to mess up
test output with upcoming tests.
This commit is contained in:
Cole Robinson 2013-07-12 14:19:54 -04:00
parent 0d5fe93048
commit f620b317b9
86 changed files with 1376 additions and 1372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/cli-test-xml/compare/cpuset-auto.xml
View File

@ -1,12 +1,12 @@
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu cpuset='0,1,2,3,4,5,6,7'>2</vcpu>
<vcpu cpuset="0,1,2,3,4,5,6,7">2</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='network'/>
<type arch="i686">hvm</type>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -17,22 +17,22 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='ps2'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<console type="pty"/>
</devices>
</domain>
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu cpuset='0,1,2,3,4,5,6,7'>2</vcpu>
<vcpu cpuset="0,1,2,3,4,5,6,7">2</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='network'/>
<type arch="i686">hvm</type>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -43,10 +43,10 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='ps2'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<console type="pty"/>
</devices>
</domain>

12
tests/cli-test-xml/compare/default.xml
View File

@ -1,11 +1,11 @@
<domain type='lxc'>
<domain type="lxc">
<name>foolxc</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>exe</type>
<type arch="x86_64">exe</type>
<init>/bin/sh</init>
</os>
<on_poweroff>destroy</on_poweroff>
@ -13,10 +13,10 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type='pty'/>
<console type="pty"/>
</devices>
</domain>

16
tests/cli-test-xml/compare/fs-default.xml
View File

@ -1,11 +1,11 @@
<domain type='lxc'>
<domain type="lxc">
<name>foolxc</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>exe</type>
<type arch="x86_64">exe</type>
<init>/sbin/init</init>
</os>
<on_poweroff>destroy</on_poweroff>
@ -14,13 +14,13 @@
<devices>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<filesystem>
<source dir='/source'/>
<target dir='/'/>
<source dir="/source"/>
<target dir="/"/>
</filesystem>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type='pty'/>
<console type="pty"/>
</devices>
</domain>

24
tests/cli-test-xml/compare/image-boot0.xml
View File

@ -1,4 +1,4 @@
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
@ -12,21 +12,21 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst__cli_root.raw'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst__cli_root.raw"/>
<target dev="xvda" bus="xen"/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst__cli_scratch.raw'/>
<target dev='xvdc' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst__cli_scratch.raw"/>
<target dev="xvdc" bus="xen"/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<video>
<model type='vga'/>
<model type="vga"/>
</video>
</devices>
</domain>

26
tests/cli-test-xml/compare/image-boot1.xml
View File

@ -1,12 +1,12 @@
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>7</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -17,19 +17,19 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst__cli_root.raw'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst__cli_root.raw"/>
<target dev="hda" bus="ide"/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<model type='e1000'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

20
tests/cli-test-xml/compare/image-nogfx.xml
View File

@ -1,4 +1,4 @@
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
@ -12,17 +12,17 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst__cli_root.raw'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst__cli_root.raw"/>
<target dev="xvda" bus="xen"/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst__cli_scratch.raw'/>
<target dev='xvdc' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst__cli_scratch.raw"/>
<target dev="xvdc" bus="xen"/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<input type="mouse" bus="xen"/>
</devices>
</domain>

114
tests/cli-test-xml/compare/kvm-f14-url.xml
View File

@ -1,11 +1,11 @@
<domain type='kvm'>
<domain type="kvm">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>hvm</type>
<type arch="x86_64">hvm</type>
<kernel>./virtinst-vmlinuz.</kernel>
<initrd>./virtinst-initrd.img.</initrd>
<cmdline>method=tests/cli-test-xml/faketree console=ttyS0</cmdline>
@ -13,22 +13,22 @@
<features>
<acpi/><apic/><pae/>
</features>
<cpu mode='custom' match='exact'>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<vendor>Intel</vendor>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tm2'/>
<feature policy='require' name='est'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='ht'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='lahf_lm'/>
<feature policy='require' name='tm'/>
<feature policy='require' name='cx16'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='ds_cpl'/>
<feature policy='require' name='xtpr'/>
<feature policy='require' name='acpi'/>
<feature policy="require" name="pbe"/>
<feature policy="require" name="tm2"/>
<feature policy="require" name="est"/>
<feature policy="require" name="ss"/>
<feature policy="require" name="ht"/>
<feature policy="require" name="ds"/>
<feature policy="require" name="lahf_lm"/>
<feature policy="require" name="tm"/>
<feature policy="require" name="cx16"/>
<feature policy="require" name="vmx"/>
<feature policy="require" name="ds_cpl"/>
<feature policy="require" name="xtpr"/>
<feature policy="require" name="acpi"/>
</cpu>
<clock offset="utc"/>
<on_poweroff>destroy</on_poweroff>
@ -36,53 +36,53 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
<driver name='qemu'/>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='vda' bus='virtio'/>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='vnc' port='-1'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>
<domain type='kvm'>
<domain type="kvm">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>hvm</type>
<boot dev='hd'/>
<type arch="x86_64">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
</features>
<cpu mode='custom' match='exact'>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<vendor>Intel</vendor>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tm2'/>
<feature policy='require' name='est'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='ht'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='lahf_lm'/>
<feature policy='require' name='tm'/>
<feature policy='require' name='cx16'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='ds_cpl'/>
<feature policy='require' name='xtpr'/>
<feature policy='require' name='acpi'/>
<feature policy="require" name="pbe"/>
<feature policy="require" name="tm2"/>
<feature policy="require" name="est"/>
<feature policy="require" name="ss"/>
<feature policy="require" name="ht"/>
<feature policy="require" name="ds"/>
<feature policy="require" name="lahf_lm"/>
<feature policy="require" name="tm"/>
<feature policy="require" name="cx16"/>
<feature policy="require" name="vmx"/>
<feature policy="require" name="ds_cpl"/>
<feature policy="require" name="xtpr"/>
<feature policy="require" name="acpi"/>
</cpu>
<clock offset="utc"/>
<on_poweroff>destroy</on_poweroff>
@ -90,21 +90,21 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
<driver name='qemu'/>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='vda' bus='virtio'/>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='vnc' port='-1'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

26
tests/cli-test-xml/compare/kvm-machine.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='fd'/>
<type arch="x86_64" machine="pc">hvm</type>
<boot dev="fd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -17,19 +17,19 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
<console type='pty'/>
<channel type='spicevmc'>
<target type='virtio' name='com.redhat.spice.0'/>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<video>
<model type='qxl'/>
<model type="qxl"/>
</video>
</devices>
</domain>

116
tests/cli-test-xml/compare/kvm-win2k3-cdrom.xml
View File

@ -1,13 +1,13 @@
<domain type='kvm'>
<domain type="kvm">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>hvm</type>
<boot dev='cdrom'/>
<boot dev='hd'/>
<type arch="x86_64">hvm</type>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -18,39 +18,39 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
<driver name='qemu'/>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='cdrom'>
<driver name='qemu'/>
<source file='/tmp/__virtinst_cli_exist2.img'/>
<target dev='hdc' bus='ide'/>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist2.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='vnc' port='-1'/>
<console type='pty'/>
<sound model='ich6'/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<sound model="ich6"/>
<video>
<model type='vga'/>
<model type="vga"/>
</video>
</devices>
</domain>
<domain type='kvm'>
<domain type="kvm">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>hvm</type>
<boot dev='hd'/>
<type arch="x86_64">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -61,39 +61,39 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
<driver name='qemu'/>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='cdrom'>
<driver name='qemu'/>
<source file='/tmp/__virtinst_cli_exist2.img'/>
<target dev='hdc' bus='ide'/>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist2.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='vnc' port='-1'/>
<console type='pty'/>
<sound model='ich6'/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<sound model="ich6"/>
<video>
<model type='vga'/>
<model type="vga"/>
</video>
</devices>
</domain>
<domain type='kvm'>
<domain type="kvm">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>hvm</type>
<boot dev='hd'/>
<type arch="x86_64">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -104,27 +104,27 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
<driver name='qemu'/>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='cdrom'>
<driver name='qemu'/>
<source file='/tmp/__virtinst_cli_exist2.img'/>
<target dev='hdc' bus='ide'/>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="/tmp/__virtinst_cli_exist2.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='vnc' port='-1'/>
<console type='pty'/>
<sound model='ich6'/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<sound model="ich6"/>
<video>
<model type='vga'/>
<model type="vga"/>
</video>
</devices>
</domain>

14
tests/cli-test-xml/compare/kvm-xenner.xml
View File

@ -1,4 +1,4 @@
<domain type='kvm'>
<domain type="kvm">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
@ -12,14 +12,14 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

12
tests/cli-test-xml/compare/manual-init.xml
View File

@ -1,11 +1,11 @@
<domain type='lxc'>
<domain type="lxc">
<name>foolxc</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>exe</type>
<type arch="x86_64">exe</type>
<init>/usr/bin/httpd</init>
</os>
<on_poweroff>destroy</on_poweroff>
@ -13,10 +13,10 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type='pty'/>
<console type="pty"/>
</devices>
</domain>

182
tests/cli-test-xml/compare/many-devices.xml
View File

@ -1,17 +1,17 @@
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<numatune>
<memory mode='preferred' nodeset='1-3,5'/>
<memory mode="preferred" nodeset="1-3,5"/>
</numatune>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/foo/bar</loader>
<boot dev='network'/>
<boot dev='hd'/>
<boot dev="network"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -22,83 +22,83 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type='file' device='disk'>
<driver cache='writeback' io='threads'/>
<source file='/default-pool/UPPER'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver cache="writeback" io="threads"/>
<source file="/default-pool/UPPER"/>
<target dev="hda" bus="ide"/>
<shareable/>
<serial>WD-WMAP9A966149</serial>
</disk>
<disk type='file' device='disk'>
<driver error_policy='enospace'/>
<source file='/tmp/__virtinst_cli_new1.img'/>
<target dev='hdb' bus='ide'/>
<disk type="file" device="disk">
<driver error_policy="enospace"/>
<source file="/tmp/__virtinst_cli_new1.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<disk type='block' device='cdrom'>
<target dev='sda' bus='sata'/>
<disk type="block" device="cdrom">
<target dev="sda" bus="sata"/>
<readonly/>
</disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0' bus='0' slot='4' function='7'/>
<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'/>
<controller type="usb" index="0" model="ich9-uhci1">
<master startport="0"/>
<address type="pci" domain="0" bus="0" slot="4" function="0"/>
</controller>
<controller type='usb' index='0' model='ich9-uhci2'>
<master startport='2'/>
<address type='pci' domain='0' bus='0' slot='4' function='1'/>
<controller type="usb" index="0" model="ich9-uhci2">
<master startport="2"/>
<address type="pci" domain="0" bus="0" slot="4" function="1"/>
</controller>
<controller type='usb' index='0' model='ich9-uhci3'>
<master startport='4'/>
<address type='pci' domain='0' bus='0' slot='4' function='2'/>
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
<address type="pci" domain="0" bus="0" slot="4" function="2"/>
</controller>
<filesystem accessmode='squash'>
<source dir='/source'/>
<target dir='/target'/>
<filesystem accessmode="squash">
<source dir="/source"/>
<target dir="/target"/>
</filesystem>
<interface type='user'>
<mac address='12:34:56:78:11:22'/>
<interface type="user">
<mac address="12:34:56:78:11:22"/>
</interface>
<interface type='bridge'>
<source bridge='foobar'/>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<interface type="bridge">
<source bridge="foobar"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type='mouse' bus='ps2'/>
<serial type='tcp'>
<source mode='bind' host='127.0.0.1' service='2222'/>
<protocol type='telnet'/>
<input type="mouse" bus="ps2"/>
<serial type="tcp">
<source mode="bind" host="127.0.0.1" service="2222"/>
<protocol type="telnet"/>
</serial>
<channel type='spicevmc'>
<target type='virtio' name='com.redhat.spice.0'/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<smartcard mode='passthrough' type='spicevmc'>
<smartcard mode="passthrough" type="spicevmc">
</smartcard>
<tpm model='tpm-tis'>
<backend type='passthrough'>
<device path='/dev/tpm0'/>
<tpm model="tpm-tis">
<backend type="passthrough">
<device path="/dev/tpm0"/>
</backend>
</tpm>
</devices>
<seclabel type='static' model='testSecurity' relabel='yes'>
<seclabel type="static" model="testSecurity" relabel="yes">
<label>system_u:object_r:svirt_image_t:s0:c100,c200</label>
</seclabel>
</domain>
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<numatune>
<memory mode='preferred' nodeset='1-3,5'/>
<memory mode="preferred" nodeset="1-3,5"/>
</numatune>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/foo/bar</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -109,67 +109,67 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type='file' device='disk'>
<driver cache='writeback' io='threads'/>
<source file='/default-pool/UPPER'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver cache="writeback" io="threads"/>
<source file="/default-pool/UPPER"/>
<target dev="hda" bus="ide"/>
<shareable/>
<serial>WD-WMAP9A966149</serial>
</disk>
<disk type='file' device='disk'>
<driver error_policy='enospace'/>
<source file='/tmp/__virtinst_cli_new1.img'/>
<target dev='hdb' bus='ide'/>
<disk type="file" device="disk">
<driver error_policy="enospace"/>
<source file="/tmp/__virtinst_cli_new1.img"/>
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<disk type='block' device='cdrom'>
<target dev='sda' bus='sata'/>
<disk type="block" device="cdrom">
<target dev="sda" bus="sata"/>
<readonly/>
</disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0' bus='0' slot='4' function='7'/>
<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'/>
<controller type="usb" index="0" model="ich9-uhci1">
<master startport="0"/>
<address type="pci" domain="0" bus="0" slot="4" function="0"/>
</controller>
<controller type='usb' index='0' model='ich9-uhci2'>
<master startport='2'/>
<address type='pci' domain='0' bus='0' slot='4' function='1'/>
<controller type="usb" index="0" model="ich9-uhci2">
<master startport="2"/>
<address type="pci" domain="0" bus="0" slot="4" function="1"/>
</controller>
<controller type='usb' index='0' model='ich9-uhci3'>
<master startport='4'/>
<address type='pci' domain='0' bus='0' slot='4' function='2'/>
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
<address type="pci" domain="0" bus="0" slot="4" function="2"/>
</controller>
<filesystem accessmode='squash'>
<source dir='/source'/>
<target dir='/target'/>
<filesystem accessmode="squash">
<source dir="/source"/>
<target dir="/target"/>
</filesystem>
<interface type='user'>
<mac address='12:34:56:78:11:22'/>
<interface type="user">
<mac address="12:34:56:78:11:22"/>
</interface>
<interface type='bridge'>
<source bridge='foobar'/>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<interface type="bridge">
<source bridge="foobar"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type='mouse' bus='ps2'/>
<serial type='tcp'>
<source mode='bind' host='127.0.0.1' service='2222'/>
<protocol type='telnet'/>
<input type="mouse" bus="ps2"/>
<serial type="tcp">
<source mode="bind" host="127.0.0.1" service="2222"/>
<protocol type="telnet"/>
</serial>
<channel type='spicevmc'>
<target type='virtio' name='com.redhat.spice.0'/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<smartcard mode='passthrough' type='spicevmc'>
<smartcard mode="passthrough" type="spicevmc">
</smartcard>
<tpm model='tpm-tis'>
<backend type='passthrough'>
<device path='/dev/tpm0'/>
<tpm model="tpm-tis">
<backend type="passthrough">
<device path="/dev/tpm0"/>
</backend>
</tpm>
</devices>
<seclabel type='static' model='testSecurity' relabel='yes'>
<seclabel type="static" model="testSecurity" relabel="yes">
<label>system_u:object_r:svirt_image_t:s0:c100,c200</label>
</seclabel>
</domain>

18
tests/cli-test-xml/compare/qemu-32-on-64.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='network'/>
<type arch="i686">hvm</type>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -17,12 +17,12 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<console type="pty"/>
</devices>
</domain>

22
tests/cli-test-xml/compare/qemu-plain.xml
View File

@ -1,17 +1,17 @@
<domain type='qemu'>
<domain type="qemu">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>hvm</type>
<boot dev='cdrom'/>
<type arch="x86_64">hvm</type>
<boot dev="cdrom"/>
</os>
<features>
<acpi/><apic/><pae/>
</features>
<cpu mode='custom' match='exact'>
<cpu mode="custom" match="exact">
<model>Penryn</model>
</cpu>
<clock offset="utc"/>
@ -20,15 +20,15 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='vnc' port='-1'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

20
tests/cli-test-xml/compare/qemu-sparc.xml
View File

@ -1,12 +1,12 @@
<domain type='qemu'>
<domain type="qemu">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='sparc' machine='SS-20'>hvm</type>
<boot dev='fd'/>
<type arch="sparc" machine="SS-20">hvm</type>
<boot dev="fd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -17,15 +17,15 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-sparc</emulator>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

28
tests/cli-test-xml/compare/simple-pxe.xml
View File

@ -1,12 +1,12 @@
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='network'/>
<type arch="i686">hvm</type>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -17,22 +17,22 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='ps2'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<console type="pty"/>
</devices>
</domain>
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='network'/>
<type arch="i686">hvm</type>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -43,10 +43,10 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='ps2'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<console type="pty"/>
</devices>
</domain>

92
tests/cli-test-xml/compare/w2k3-cdrom.xml
View File

@ -1,19 +1,19 @@
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>4</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='cdrom'/>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
</features>
<cpu mode='custom'>
<topology sockets='1' cores='4' threads='1'/>
<cpu mode="custom">
<topology sockets="1" cores="4" threads="1"/>
</cpu>
<clock offset="localtime"/>
<on_poweroff>destroy</on_poweroff>
@ -21,37 +21,37 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='cdrom'>
<source file='/tmp/__virtinst_cli_exist2.img'/>
<target dev='hdc' bus='ide'/>
<disk type="file" device="cdrom">
<source file="/tmp/__virtinst_cli_exist2.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='tablet' bus='usb'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<console type="pty"/>
</devices>
</domain>
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>4</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
</features>
<cpu mode='custom'>
<topology sockets='1' cores='4' threads='1'/>
<cpu mode="custom">
<topology sockets="1" cores="4" threads="1"/>
</cpu>
<clock offset="localtime"/>
<on_poweroff>destroy</on_poweroff>
@ -59,37 +59,37 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='cdrom'>
<source file='/tmp/__virtinst_cli_exist2.img'/>
<target dev='hdc' bus='ide'/>
<disk type="file" device="cdrom">
<source file="/tmp/__virtinst_cli_exist2.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='tablet' bus='usb'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<console type="pty"/>
</devices>
</domain>
<domain type='test'>
<domain type="test">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>4</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
</features>
<cpu mode='custom'>
<topology sockets='1' cores='4' threads='1'/>
<cpu mode="custom">
<topology sockets="1" cores="4" threads="1"/>
</cpu>
<clock offset="localtime"/>
<on_poweroff>destroy</on_poweroff>
@ -97,19 +97,19 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='cdrom'>
<source file='/tmp/__virtinst_cli_exist2.img'/>
<target dev='hdc' bus='ide'/>
<disk type="file" device="cdrom">
<source file="/tmp/__virtinst_cli_exist2.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='tablet' bus='usb'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<console type="pty"/>
</devices>
</domain>

20
tests/cli-test-xml/compare/xen-default.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
@ -12,18 +12,18 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

34
tests/cli-test-xml/compare/xen-hvm.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>hvm</type>
<type arch="x86_64">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -19,24 +19,24 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='cdrom'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hdc' bus='ide'/>
<disk type="file" device="cdrom">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

20
tests/cli-test-xml/compare/xen-ia64-default.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
@ -12,18 +12,18 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

50
tests/cli-test-xml/compare/xen-ia64-hvm.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='ia64'>hvm</type>
<type arch="ia64">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<kernel>./virtinst-vmlinuz.</kernel>
<initrd>./virtinst-initrd.img.</initrd>
@ -20,32 +20,32 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='ia64'>hvm</type>
<type arch="ia64">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -56,19 +56,19 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

42
tests/cli-test-xml/compare/xen-ia64-pv.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='ia64'>linux</type>
<type arch="ia64">linux</type>
<kernel>./virtinst-vmlinuz.</kernel>
<initrd>./virtinst-initrd.img.</initrd>
<cmdline>method=tests/cli-test-xml/faketree</cmdline>
@ -17,22 +17,22 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
@ -46,18 +46,18 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

42
tests/cli-test-xml/compare/xen-pv.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64'>linux</type>
<type arch="x86_64">linux</type>
<kernel>./virtinst-vmlinuz.</kernel>
<initrd>./virtinst-initrd.img.</initrd>
<cmdline>method=tests/cli-test-xml/faketree</cmdline>
@ -17,22 +17,22 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>
<domain type='xen'>
<domain type="xen">
<name>foobar</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
@ -46,18 +46,18 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/__virtinst_cli_exist1.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='00:11:22:33:44:55'/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

36
tests/image-xml/image2guest/image-format-out.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -17,23 +17,23 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='REPLACEME/tests/image-xml/image-kernel.xml'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="REPLACEME/tests/image-xml/image-kernel.xml"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow'/>
<source file='REPLACEME/tests/image-xml/image.xml'/>
<target dev='hdb' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="qcow"/>
<source file="REPLACEME/tests/image-xml/image.xml"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='vmdk'/>
<source file='REPLACEME/tests/image-xml/image-format.xml'/>
<target dev='hdc' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="vmdk"/>
<source file="REPLACEME/tests/image-xml/image-format.xml"/>
<target dev="hdc" bus="ide"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

30
tests/image-xml/image2guest/image-xenfv32.xml
View File

@ -1,12 +1,12 @@
<domain type='test'>
<domain type="test">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/><pae/>
@ -17,20 +17,20 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/root.raw'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/root.raw"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/data.raw'/>
<target dev='hdb' bus='ide'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/data.raw"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/scratch.raw'/>
<target dev='hdd' bus='ide'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/scratch.raw"/>
<target dev="hdd" bus="ide"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

26
tests/image-xml/image2guest/image-xenpv32-kernel.xml
View File

@ -1,11 +1,11 @@
<domain type='test'>
<domain type="test">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>xen</type>
<type arch="i686">xen</type>
<kernel>/foo/kernel</kernel>
<initrd>/foo/initrd</initrd>
<cmdline>ro quiet</cmdline>
@ -17,19 +17,19 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/root.raw'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/root.raw"/>
<target dev="xvda" bus="xen"/>
</disk>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/data.raw'/>
<target dev='xvdb' bus='xen'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/data.raw"/>
<target dev="xvdb" bus="xen"/>
</disk>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/scratch.raw'/>
<target dev='xvdc' bus='xen'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/scratch.raw"/>
<target dev="xvdc" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

24
tests/image-xml/image2guest/image-xenpv32.xml
View File

@ -1,4 +1,4 @@
<domain type='test'>
<domain type="test">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -12,19 +12,19 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/root.raw'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/root.raw"/>
<target dev="xvda" bus="xen"/>
</disk>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/data.raw'/>
<target dev='xvdb' bus='xen'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/data.raw"/>
<target dev="xvdb" bus="xen"/>
</disk>
<disk type='file' device='disk'>
<source file='REPLACEME/tests/image-xml/scratch.raw'/>
<target dev='xvdc' bus='xen'/>
<disk type="file" device="disk">
<source file="REPLACEME/tests/image-xml/scratch.raw"/>
<target dev="xvdc" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

13
tests/utils.py
View File

@ -113,15 +113,12 @@ def sanitize_xml_for_define(xml):
if not xml:
return xml
xml = xml.replace("\"", "'")
xml = xml.replace("<domain type='xen'>",
"<domain type='test'>")
xml = xml.replace("<domain type='qemu'>",
"<domain type='test'>")
xml = xml.replace("<domain type='kvm'>",
"<domain type='test'>")
xml = xml.replace(">linux<", ">xen<")
for t in ["xen", "qemu", "kvm"]:
xml = xml.replace("<domain type=\"%s\">" % t,
"<domain type=\"test\">")
xml = xml.replace("<domain type='%s'>" % t,
"<domain type='test'>")
return xml

26
tests/xmlconfig-xml/boot-cpuset.xml
View File

@ -1,23 +1,23 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu cpuset='0,1,2,3,4,5,6,7' current='5'>7</vcpu>
<vcpu cpuset="0,1,2,3,4,5,6,7" current="5">7</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
</features>
<cpu mode='custom' match='minimum'>
<cpu mode="custom" match="minimum">
<model>footest</model>
<vendor>Intel</vendor>
<topology sockets='4' cores='5' threads='2'/>
<feature policy='force' name='x2apic'/>
<feature policy='forbid' name='lahf_lm'/>
<topology sockets="4" cores="5" threads="2"/>
<feature policy="force" name="x2apic"/>
<feature policy="forbid" name="lahf_lm"/>
</cpu>
<clock offset="utc"/>
<on_poweroff>destroy</on_poweroff>
@ -25,12 +25,12 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

18
tests/xmlconfig-xml/boot-default-bridge.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/>
@ -18,9 +18,9 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<interface type='bridge'>
<source bridge='br0'/>
<mac address='22:22:33:44:55:66'/>
<interface type="bridge">
<source bridge="br0"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<interface type="bridge">
<mac address="22:22:33:44:55:67"/>
@ -31,8 +31,8 @@
<mac address="22:22:33:44:55:68"/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

18
tests/xmlconfig-xml/boot-default-device-removal.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,14 +18,14 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
</devices>
</domain>

22
tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,16 +18,16 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='hda' bus='ide'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

22
tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,16 +18,16 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

20
tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<bootmenu enable='yes'/>
<boot dev="network"/>
<bootmenu enable="yes"/>
</os>
<features>
<acpi/><apic/>
@ -19,12 +19,12 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

12
tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/>
@ -18,8 +18,8 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

18
tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,12 +18,12 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

42
tests/xmlconfig-xml/boot-many-chars.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/>
@ -18,29 +18,29 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<serial type='null'/>
<serial type='tcp'>
<source mode='bind' host='my.source.host' service='1234'/>
<protocol type='telnet'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<serial type="null"/>
<serial type="tcp">
<source mode="bind" host="my.source.host" service="1234"/>
<protocol type="telnet"/>
</serial>
<parallel type='unix'>
<source mode='bind' path='/tmp/foobar'/>
<parallel type="unix">
<source mode="bind" path="/tmp/foobar"/>
</parallel>
<parallel type='udp'>
<source mode='bind' host='my.bind.host' service='1111'/>
<source mode='connect' host='my.source.host' service='2222'/>
<parallel type="udp">
<source mode="bind" host="my.bind.host" service="1111"/>
<source mode="connect" host="my.source.host" service="2222"/>
</parallel>
<console type='pty'/>
<console type='pty'>
<target type='virtio'/>
<console type="pty"/>
<console type="pty">
<target type="virtio"/>
</console>
<channel type='pty'>
<target type='virtio' name='foo.bar.frob'/>
<channel type="pty">
<target type="virtio" name="foo.bar.frob"/>
</channel>
<channel type='pty'>
<target type='guestfwd' address='1.2.3.4' port='4567'/>
<channel type="pty">
<target type="guestfwd" address="1.2.3.4" port="4567"/>
</channel>
</devices>
</domain>

112
tests/xmlconfig-xml/boot-many-devices.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<description>foooo barrrr somedesc</description>
@ -9,9 +9,9 @@
</memoryBacking>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -22,81 +22,81 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='floppy'>
<source dev='/dev/loop0'/>
<target dev='fda' bus='fdc'/>
<disk type="block" device="floppy">
<source dev="/dev/loop0"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='sda' bus='scsi'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="sda" bus="scsi"/>
</disk>
<disk type='dir' device='floppy'>
<source dir='/tmp'/>
<target dev='fdb' bus='fdc'/>
<disk type="dir" device="floppy">
<source dir="/tmp"/>
<target dev="fdb" bus="fdc"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='/default-pool/testvol1.img'/>
<target dev='sdb' bus='scsi'/>
<address type='spapr-vio'/>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/default-pool/testvol1.img"/>
<target dev="sdb" bus="scsi"/>
<address type="spapr-vio"/>
</disk>
<controller type='scsi' index='0'>
<address type='spapr-vio'/>
<controller type="scsi" index="0">
<address type="spapr-vio"/>
</controller>
<controller type='ide' index='3'/>
<controller type='virtio-serial' index='0' ports='32' vectors='17'/>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<model type='e1000'/>
<controller type="ide" index="3"/>
<controller type="virtio-serial" index="0" ports="32" vectors="17"/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="e1000"/>
</interface>
<interface type='user'>
<mac address='22:11:11:11:11:11'/>
<interface type="user">
<mac address="22:11:11:11:11:11"/>
</interface>
<interface type='network'>
<source network='default'/>
<mac address='22:22:22:22:22:22'/>
<model type='spapr-vlan'/>
<address type='spapr-vio'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:22:22:22:22"/>
<model type="spapr-vlan"/>
<address type="spapr-vio"/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<graphics type='vnc' port='-1' keymap='en-us'/>
<graphics type='vnc' port='-1'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us' passwdValidTo='foobar'/>
<graphics type='sdl' display='foodisplay' xauth='fooxauth'/>
<serial type='null'/>
<parallel type='unix'>
<source mode='bind' path='/tmp/foobar'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
<graphics type="vnc" port="-1"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes" keymap="en-us" passwdValidTo="foobar"/>
<graphics type="sdl" display="foodisplay" xauth="fooxauth"/>
<serial type="null"/>
<parallel type="unix">
<source mode="bind" path="/tmp/foobar"/>
</parallel>
<channel type='spicevmc'>
<target type='virtio' name='com.redhat.spice.0'/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<sound model='sb16'/>
<sound model='es1370'/>
<sound model="sb16"/>
<sound model="es1370"/>
<video>
<model type='vmvga'/>
<model type="vmvga"/>
</video>
<video>
<model type='cirrus' vram='10240' heads='3'/>
<model type="cirrus" vram="10240" heads="3"/>
</video>
<video>
<model type='qxl'/>
<model type="qxl"/>
</video>
<video>
<model type='qxl'/>
<model type="qxl"/>
</video>
<hostdev mode='subsystem' type='usb' managed='yes'>
<hostdev mode="subsystem" type="usb" managed="yes">
<source>
<vendor id='0x4321'/>
<product id='0x1234'/>
<vendor id="0x4321"/>
<product id="0x1234"/>
</source>
</hostdev>
<watchdog model='ib700' action='none'/>
<memballoon model='virtio'/>
<watchdog model="ib700" action="none"/>
<memballoon model="virtio"/>
</devices>
<seclabel type='static' model='selinux'>
<seclabel type="static" model="selinux">
<label>foolabel</label>
<imagelabel>imagelabel</imagelabel>
</seclabel>

64
tests/xmlconfig-xml/boot-many-disks2.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,44 +18,44 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<driver type='raw'/>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<driver type="raw"/>
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'/>
<source dev='/dev/loop0'/>
<target dev='hdd' bus='ide'/>
<disk type="block" device="disk">
<driver name="qemu" type="qcow2"/>
<source dev="/dev/loop0"/>
<target dev="hdd" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='sda' bus='scsi'/>
<disk type="block" device="cdrom">
<target dev="sda" bus="scsi"/>
<readonly/>
</disk>
<disk type='block' device='floppy'>
<target dev='fda' bus='fdc'/>
<disk type="block" device="floppy">
<target dev="fda" bus="fdc"/>
</disk>
<disk type='block' device='floppy'>
<driver name='phy' cache='none'/>
<source dev='/dev/loop0'/>
<target dev='fdb' bus='fdc'/>
<disk type="block" device="floppy">
<driver name="phy" cache="none"/>
<source dev="/dev/loop0"/>
<target dev="fdb" bus="fdc"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2' cache='none' io='threads'/>
<source dev='/dev/loop0'/>
<target dev='vda' bus='virtio'/>
<disk type="block" device="disk">
<driver name="qemu" type="qcow2" cache="none" io="threads"/>
<source dev="/dev/loop0"/>
<target dev="vda" bus="virtio"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

22
tests/xmlconfig-xml/boot-many-hostdevs.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/>
@ -18,18 +18,18 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<hostdev mode='subsystem' type='usb' managed='yes'>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<hostdev mode="subsystem" type="usb" managed="yes">
<source>
<vendor id='0x4321'/>
<product id='0x1234'/>
<vendor id="0x4321"/>
<product id="0x1234"/>
</source>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<hostdev mode="subsystem" type="pci" managed="yes">
<source>
<address domain='0x0' bus='0x11' slot='0x2' function='0x3'/>
<address domain="0x0" bus="0x11" slot="0x2" function="0x3"/>
</source>
</hostdev>
</devices>

44
tests/xmlconfig-xml/boot-many-nics.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/>
@ -18,29 +18,29 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<interface type='user'>
<mac address='22:11:11:11:11:11'/>
<interface type="user">
<mac address="22:11:11:11:11:11"/>
</interface>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<model type='e1000'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="e1000"/>
</interface>
<interface type='bridge'>
<source bridge='foobr0'/>
<mac address='22:22:22:22:22:22'/>
<target dev='foo1'/>
<interface type="bridge">
<source bridge="foobr0"/>
<mac address="22:22:22:22:22:22"/>
<target dev="foo1"/>
</interface>
<interface type='ethernet'>
<source dev='testeth1'/>
<mac address='00:11:00:22:00:33'/>
<interface type="ethernet">
<source dev="testeth1"/>
<mac address="00:11:00:22:00:33"/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

20
tests/xmlconfig-xml/boot-many-sounds.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/>
@ -18,12 +18,12 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='sb16'/>
<sound model='es1370'/>
<sound model='pcspk'/>
<sound model='es1370'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="sb16"/>
<sound model="es1370"/>
<sound model="pcspk"/>
<sound model="es1370"/>
</devices>
</domain>

12
tests/xmlconfig-xml/boot-paravirt-disk-block.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -9,11 +9,11 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='xvda' bus='xen'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

14
tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -9,12 +9,12 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<driver name='file'/>
<source file='/tmp/test.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<driver name="file"/>
<source file="/tmp/test.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

14
tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -9,12 +9,12 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='block' device='disk'>
<driver name='phy'/>
<source dev='/dev/loop0'/>
<target dev='xvda' bus='xen'/>
<disk type="block" device="disk">
<driver name="phy"/>
<source dev="/dev/loop0"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

14
tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -9,12 +9,12 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<driver name='tap' type='qcow'/>
<source file='/tmp/test.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<driver name="tap" type="qcow"/>
<source file="/tmp/test.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

14
tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -9,12 +9,12 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<driver name='tap'/>
<source file='/tmp/test.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<driver name="tap"/>
<source file="/tmp/test.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

12
tests/xmlconfig-xml/boot-paravirt-disk-file.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -9,11 +9,11 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/somerandomfilename.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/somerandomfilename.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

26
tests/xmlconfig-xml/boot-paravirt-many-disks.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -9,20 +9,20 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/test1.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/test1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<disk type='file' device='disk'>
<driver name='tap' type='qcow'/>
<source file='/tmp/test2.img'/>
<target dev='xvdb' bus='xen'/>
<disk type="file" device="disk">
<driver name="tap" type="qcow"/>
<source file="/tmp/test2.img"/>
<target dev="xvdb" bus="xen"/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='xvdc' bus='xen'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="xvdc" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

26
tests/xmlconfig-xml/boot-usb2.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/>
@ -18,18 +18,18 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<controller type='usb' index='0' model='ich9-ehci1'/>
<controller type='usb' index='0' model='ich9-uhci1'>
<master startport='0'/>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type='usb' index='0' model='ich9-uhci2'>
<master startport='2'/>
<controller type="usb" index="0" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type='usb' index='0' model='ich9-uhci3'>
<master startport='4'/>
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
</controller>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

38
tests/xmlconfig-xml/install-f10.xml
View File

@ -1,13 +1,13 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='network'/>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="network"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,23 +18,23 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/test.img'/>
<target dev='vda' bus='virtio'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='vdb' bus='virtio'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="vdb" bus="virtio"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="virtio"/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

50
tests/xmlconfig-xml/install-f11-ac97.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -17,33 +17,33 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
<source file='/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/test.img'/>
<target dev='vda' bus='virtio'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='vdb' bus='virtio'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="vdb" bus="virtio"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='ac97'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="ac97"/>
</devices>
</domain>

50
tests/xmlconfig-xml/install-f11-noac97.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -17,33 +17,33 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
<source file='/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/test.img'/>
<target dev='vda' bus='virtio'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='vdb' bus='virtio'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="vdb" bus="virtio"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='es1370'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="es1370"/>
</devices>
</domain>

46
tests/xmlconfig-xml/install-f11-qemu.xml
View File

@ -1,12 +1,12 @@
<domain type='qemu'>
<domain type="qemu">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -17,31 +17,31 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
<source file='/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

40
tests/xmlconfig-xml/install-f11-xen.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,28 +18,28 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<source file='/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
<disk type="file" device="floppy">
<source file="/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

48
tests/xmlconfig-xml/install-f11.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -17,32 +17,32 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
<source file='/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/test.img'/>
<target dev='vda' bus='virtio'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='vdb' bus='virtio'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="vdb" bus="virtio"/>
</disk>
<disk type='block' device='cdrom'>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

26
tests/xmlconfig-xml/install-fullyvirt-disk-block.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -19,17 +19,17 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='hda' bus='ide'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

26
tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -19,17 +19,17 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

16
tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<kernel>kernel</kernel>
<initrd>initrd</initrd>
@ -20,12 +20,12 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

26
tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml
View File

@ -1,17 +1,17 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev='fd'/>
<boot dev='cdrom'/>
<boot dev='network'/>
<bootmenu enable='no'/>
<boot dev="hd"/>
<boot dev="fd"/>
<boot dev="cdrom"/>
<boot dev="network"/>
<bootmenu enable="no"/>
</os>
<features>
<acpi/><apic/>
@ -22,12 +22,12 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

18
tests/xmlconfig-xml/install-fullyvirt-import.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='hd'/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,12 +18,12 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

18
tests/xmlconfig-xml/install-fullyvirt-livecd.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev="cdrom"/>
</os>
<features>
<acpi/><apic/>
@ -18,13 +18,13 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='cdrom'>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

12
tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml
View File

@ -1,13 +1,13 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev="network"/>
</os>
<features>
<acpi/><apic/>
@ -18,8 +18,8 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

20
tests/xmlconfig-xml/install-fullyvirt-pxe.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='network'/>
<boot dev='hd'/>
<boot dev="network"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -19,12 +19,12 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

14
tests/xmlconfig-xml/install-paravirt-disk-block.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>linux</type>
<type arch="i686">linux</type>
<kernel>/boot/vmlinuz</kernel>
<initrd>/boot/initrd</initrd>
</os>
@ -13,11 +13,11 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='xvda' bus='xen'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

16
tests/xmlconfig-xml/install-paravirt-disk-drv-file.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>linux</type>
<type arch="i686">linux</type>
<kernel>/boot/vmlinuz</kernel>
<initrd>/boot/initrd</initrd>
</os>
@ -13,12 +13,12 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<driver name='file'/>
<source file='/tmp/test.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<driver name="file"/>
<source file="/tmp/test.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

16
tests/xmlconfig-xml/install-paravirt-disk-drv-phy.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>linux</type>
<type arch="i686">linux</type>
<kernel>/boot/vmlinuz</kernel>
<initrd>/boot/initrd</initrd>
</os>
@ -13,12 +13,12 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='block' device='disk'>
<driver name='phy'/>
<source dev='/dev/loop0'/>
<target dev='xvda' bus='xen'/>
<disk type="block" device="disk">
<driver name="phy"/>
<source dev="/dev/loop0"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

16
tests/xmlconfig-xml/install-paravirt-disk-drv-tap-qcow.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>linux</type>
<type arch="i686">linux</type>
<kernel>/boot/vmlinuz</kernel>
<initrd>/boot/initrd</initrd>
</os>
@ -13,12 +13,12 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<driver name='tap' type='qcow'/>
<source file='/tmp/test.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<driver name="tap" type="qcow"/>
<source file="/tmp/test.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

16
tests/xmlconfig-xml/install-paravirt-disk-drv-tap.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>linux</type>
<type arch="i686">linux</type>
<kernel>/boot/vmlinuz</kernel>
<initrd>/boot/initrd</initrd>
</os>
@ -13,12 +13,12 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<driver name='tap'/>
<source file='/tmp/test.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<driver name="tap"/>
<source file="/tmp/test.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

14
tests/xmlconfig-xml/install-paravirt-disk-file.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>linux</type>
<type arch="i686">linux</type>
<kernel>/boot/vmlinuz</kernel>
<initrd>/boot/initrd</initrd>
</os>
@ -13,11 +13,11 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

12
tests/xmlconfig-xml/install-paravirt-import.xml
View File

@ -1,4 +1,4 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
@ -9,11 +9,11 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

28
tests/xmlconfig-xml/install-paravirt-many-disks.xml
View File

@ -1,11 +1,11 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>linux</type>
<type arch="i686">linux</type>
<kernel>/boot/vmlinuz</kernel>
<initrd>/boot/initrd</initrd>
</os>
@ -13,20 +13,20 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='file' device='disk'>
<source file='/tmp/test1.img'/>
<target dev='xvda' bus='xen'/>
<disk type="file" device="disk">
<source file="/tmp/test1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<disk type='file' device='disk'>
<driver name='tap' type='qcow'/>
<source file='/tmp/test2.img'/>
<target dev='xvdb' bus='xen'/>
<disk type="file" device="disk">
<driver name="tap" type="qcow"/>
<source file="/tmp/test2.img"/>
<target dev="xvdb" bus="xen"/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='xvdc' bus='xen'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="xvdc" bus="xen"/>
</disk>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' keymap='ja'/>
<input type="mouse" bus="xen"/>
<graphics type="vnc" port="-1" keymap="ja"/>
</devices>
</domain>

40
tests/xmlconfig-xml/install-windowsxp-xennew.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -19,26 +19,26 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='es1370'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="es1370"/>
</devices>
</domain>

40
tests/xmlconfig-xml/install-windowsxp-xenold.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<clock offset="localtime"/>
<on_poweroff>destroy</on_poweroff>
@ -16,26 +16,26 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/loop0'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<source dev="/dev/loop0"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='es1370'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="es1370"/>
</devices>
</domain>

30
tests/xmlconfig-xml/misc-qemu-driver-name.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -19,19 +19,19 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hda' bus='ide'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

30
tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -19,19 +19,19 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='/default-pool/iso-vol'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/default-pool/iso-vol"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

38
tests/xmlconfig-xml/misc-qemu-driver-type.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -19,24 +19,24 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/test.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/tmp/test.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/iscsi-pool/diskvol1'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<driver name="qemu" type="raw"/>
<source dev="/iscsi-pool/diskvol1"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

30
tests/xmlconfig-xml/misc-qemu-iso-disk.xml
View File

@ -1,14 +1,14 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -19,19 +19,19 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/default-pool/iso-vol'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/default-pool/iso-vol"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

28
tests/xmlconfig-xml/misc-xml-escaping.xml
View File

@ -1,17 +1,17 @@
<domain type='xen'>
<domain type="xen">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<description>foooo barrrr
baz &amp;&amp; snarf. &apos;&apos; &quot;&quot; @@$
baz &amp;&amp; snarf. '' "" @@$
</description>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -22,17 +22,17 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<source file='/tmp/ISO&amp;&apos;&amp;s'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<source file="/tmp/ISO&amp;'&amp;s"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<input type="mouse" bus="ps2"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
</devices>
</domain>

46
tests/xmlconfig-xml/rhel6-kvm-stage1.xml
View File

@ -1,11 +1,11 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<type arch="i686">hvm</type>
<kernel>kernel</kernel>
<initrd>initrd</initrd>
<cmdline>method=tests/cli-test-xml/fakerhel6tree</cmdline>
@ -19,32 +19,32 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
<source file='/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/default-pool/rhel6.img'/>
<target dev='vda' bus='virtio'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/default-pool/rhel6.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='vdb' bus='virtio'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="vdb" bus="virtio"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='ich6'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="ich6"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

48
tests/xmlconfig-xml/rhel6-kvm-stage2.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -17,32 +17,32 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='floppy'>
<driver name='qemu' type='qcow2'/>
<source file='/default-pool/testvol1.img'/>
<target dev='fda' bus='fdc'/>
<disk type="file" device="floppy">
<driver name="qemu" type="qcow2"/>
<source file="/default-pool/testvol1.img"/>
<target dev="fda" bus="fdc"/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/default-pool/rhel6.img'/>
<target dev='vda' bus='virtio'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/default-pool/rhel6.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='vdb' bus='virtio'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="vdb" bus="virtio"/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<model type='virtio'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="virtio"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='ich6'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="ich6"/>
<video>
<model type='cirrus'/>
<model type="cirrus"/>
</video>
</devices>
</domain>

48
tests/xmlconfig-xml/winxp-kvm-stage1.xml
View File

@ -1,13 +1,13 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='cdrom'/>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -18,32 +18,32 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/default-pool/winxp.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/default-pool/winxp.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='ich6'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="ich6"/>
<video>
<model type='vga'/>
<model type="vga"/>
</video>
</devices>
</domain>

46
tests/xmlconfig-xml/winxp-kvm-stage2.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -17,32 +17,32 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/default-pool/winxp.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/default-pool/winxp.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='ich6'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="ich6"/>
<video>
<model type='vga'/>
<model type="vga"/>
</video>
</devices>
</domain>

46
tests/xmlconfig-xml/winxp-kvm-stage3.xml
View File

@ -1,12 +1,12 @@
<domain type='kvm'>
<domain type="kvm">
<name>TestGuest</name>
<uuid>12345678-1234-1234-1234-123456789012</uuid>
<memory>409600</memory>
<currentMemory>204800</currentMemory>
<vcpu>5</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
<type arch="i686">hvm</type>
<boot dev="hd"/>
</os>
<features>
<acpi/><apic/>
@ -17,32 +17,32 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/default-pool/winxp.img'/>
<target dev='hda' bus='ide'/>
<disk type="file" device="disk">
<driver name="qemu" type="raw"/>
<source file="/default-pool/winxp.img"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdb' bus='ide'/>
<disk type="block" device="disk">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdb" bus="ide"/>
</disk>
<disk type='block' device='cdrom'>
<driver name='qemu'/>
<source dev='/dev/loop0'/>
<target dev='hdc' bus='ide'/>
<disk type="block" device="cdrom">
<driver name="qemu"/>
<source dev="/dev/loop0"/>
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<interface type='network'>
<source network='default'/>
<mac address='22:22:33:44:55:66'/>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<input type='tablet' bus='usb'/>
<graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
<console type='pty'/>
<sound model='ich6'/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
<console type="pty"/>
<sound model="ich6"/>
<video>
<model type='vga'/>
<model type="vga"/>
</video>
</devices>
</domain>

6
virtinst/Guest.py
View File

@ -957,7 +957,11 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain):
xml = add(self._get_seclabel_xml())
xml = add("</domain>\n")
return xml
def cb(doc, ctx):
ignore = ctx
return doc.serialize()
xml = util.xml_parse_wrapper(xml, cb)
return "\n".join(xml.splitlines()[1:]) + "\n"
def get_continue_inst(self):
"""

3
virtinst/connection.py
View File

@ -45,8 +45,11 @@ def _sanitize_xml(xml):
orig = xml
xml = re.sub("arch='.*'", "arch='i686'", xml)
xml = re.sub("arch=\".*\"", "arch='i686'", xml)
xml = re.sub("domain type='.*'", "domain type='test'", xml)
xml = re.sub("domain type=\".*\"", "domain type='test'", xml)
xml = re.sub("machine type='.*'", "", xml)
xml = re.sub("machine type=\".*\"", "", xml)
xml = re.sub(">exe<", ">hvm<", xml)
logging.debug("virtinst test sanitizing diff\n:%s",