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

tests: Clean up capabilities test data 

Make it clear which ones are used for the caps unit tests, and which
are for cli/UI testing and can be updated at will. And drop a bunch
of outdated stuff.
This commit is contained in:
Cole Robinson 2015-04-22 17:06:35 -04:00
parent 8a3e3391c8
commit 6fd3983f6d
52 changed files with 1013 additions and 1004 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
tests/capabilities-xml/capabilities-kvm.xml
View File

@ -1,88 +0,0 @@
<capabilities>
<host>
<cpu>
<arch>i686</arch>
</cpu>
<secmodel>
<model>dac</model>
<doi>0</doi>
<baselabel type='kvm'>+0:+0</baselabel>
<baselabel type='qemu'>+0:+0</baselabel>
</secmodel>
</host>
<guest>
<os_type>hvm</os_type>
<arch name="i686">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu</emulator>
<domain type="qemu"/>
<machine>pc</machine>
<machine>isapc</machine>
<domain type="kvm">
<emulator>/usr/bin/qemu-kvm</emulator>
</domain>
</arch>
<features>
<pae/>
<nonpae/>
<acpi default='on' toggle='yes'/>
<apic default='on' toggle='no'/>
</features>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="x86_64">
<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<domain type="qemu"/>
<machine>pc</machine>
<machine>isapc</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="mips">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-mips</emulator>
<domain type="qemu"/>
<machine>mips</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="mipsel">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-mipsel</emulator>
<domain type="qemu"/>
<machine>mips</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="sparc">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-sparc</emulator>
<domain type="qemu"/>
<machine>sun4m</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="ppc">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-ppc</emulator>
<domain type="qemu"/>
<machine>g3bw</machine>
<machine>mac99</machine>
<machine>prep</machine>
</arch>
</guest>
</capabilities>

42
tests/capabilities-xml/capabilities-lxc.xml
View File

@ -1,42 +0,0 @@
<capabilities>
<host>
<uuid>97e80381-494f-11cb-8e0e-cbc168f7d753</uuid>
<cpu>
<arch>x86_64</arch>
</cpu>
<topology>
<cells num='1'>
<cell id='0'>
<cpus num='2'>
<cpu id='0'/>
<cpu id='1'/>
</cpus>
</cell>
</cells>
</topology>
</host>
<guest>
<os_type>exe</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<domain type='lxc'>
</domain>
</arch>
</guest>
<guest>
<os_type>exe</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<domain type='lxc'>
</domain>
</arch>
</guest>
</capabilities>

75
tests/capabilities-xml/capabilities-qemu.xml
View File

@ -1,75 +0,0 @@
<capabilities>
<host>
<cpu>
<arch>x86_64</arch>
</cpu>
<secmodel>
<model>selinux</model>
<doi>0</doi>
</secmodel>
</host>
<guest>
<os_type>hvm</os_type>
<arch name="x86_64">
<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<domain type="qemu"/>
<machine>pc</machine>
<machine>isapc</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="i686">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu</emulator>
<domain type="qemu"/>
<machine>pc</machine>
<machine>isapc</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="mips">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-mips</emulator>
<domain type="qemu"/>
<machine>mips</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="mipsel">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-mipsel</emulator>
<domain type="qemu"/>
<machine>mips</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="sparc">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-sparc</emulator>
<domain type="qemu"/>
<machine>sun4m</machine>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="ppc">
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-ppc</emulator>
<domain type="qemu"/>
<machine>g3bw</machine>
<machine>mac99</machine>
<machine>prep</machine>
</arch>
</guest>
</capabilities>

57
tests/capabilities-xml/capabilities-test.xml
View File

@ -1,57 +0,0 @@
<capabilities>
<host>
<cpu>
<arch>i686</arch>
<features>
<pae/>
<nonpae/>
</features>
</cpu>
<topology>
<cells num='2'>
<cell id='0'>
<cpus num='8'>
<cpu id='0'/>
<cpu id='2'/>
<cpu id='4'/>
<cpu id='6'/>
<cpu id='8'/>
<cpu id='10'/>
<cpu id='12'/>
<cpu id='14'/>
</cpus>
</cell>
<cell id='1'>
<cpus num='8'>
<cpu id='1'/>
<cpu id='3'/>
<cpu id='5'/>
<cpu id='7'/>
<cpu id='9'/>
<cpu id='11'/>
<cpu id='13'/>
<cpu id='15'/>
</cpus>
</cell>
</cells>
</topology>
<secmodel>
<model>testSecurity</model>
<doi></doi>
</secmodel>
</host>
<guest>
<os_type>linux</os_type>
<arch name="i686">
<wordsize>32</wordsize>
<domain type="test"/>
</arch>
<features>
<pae/>
<nonpae/>
</features>
</guest>
</capabilities>

61
tests/capabilities-xml/capabilities-xen.xml
View File

@ -1,61 +0,0 @@
<capabilities>
<host>
<cpu>
<arch>x86_64</arch>
<features>
<vmx/>
</features>
</cpu>
</host>
<guest>
<os_type>xen</os_type>
<arch name="x86_64">
<wordsize>64</wordsize>
<domain type="xen"></domain>
</arch>
<features>
</features>
</guest>
<guest>
<os_type>xen</os_type>
<arch name="i686">
<wordsize>32</wordsize>
<domain type="xen"></domain>
</arch>
<features>
<pae/>
</features>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="i686">
<wordsize>32</wordsize>
<domain type="xen"></domain>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
<machine>pc</machine>
<machine>isapc</machine>
<loader>/usr/lib/xen/boot/hvmloader</loader>
</arch>
<features>
<pae/>
<nonpae/>
</features>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name="x86_64">
<wordsize>64</wordsize>
<domain type="xen"></domain>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
<machine>pc</machine>
<machine>isapc</machine>
<loader>/usr/lib/xen/boot/hvmloader</loader>
</arch>
<features>
</features>
</guest>
</capabilities>

14
tests/capabilities-xml/empty-caps.xml
View File

@ -1,14 +0,0 @@
<capabilities>
<host>
<cpu>
<arch>x86_64</arch>
<features>
<pae/>
</features>
</cpu>
</host>
</capabilities>

103
tests/capabilities-xml/kvm-aarch64.xml Normal file
View File

@ -0,0 +1,103 @@
<capabilities>
<!-- From Fedora 21 on APM Mustang, libvirt 1.2.9.2 -->
<host>
<uuid>25ef0280-ec82-42b0-8fb6-10adccc67c02</uuid>
<cpu>
<arch>aarch64</arch>
<model>host</model>
<topology sockets='4' cores='2' threads='1'/>
<pages unit='KiB' size='64'/>
<pages unit='KiB' size='524288'/>
</cpu>
<power_management/>
<migration_features>
<live/>
<uri_transports>
<uri_transport>tcp</uri_transport>
<uri_transport>rdma</uri_transport>
</uri_transports>
</migration_features>
<topology>
<cells num='1'>
<cell id='0'>
<memory unit='KiB'>16647424</memory>
<cpus num='8'>
<cpu id='0' socket_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='1' core_id='0' siblings='2'/>
<cpu id='3' socket_id='1' core_id='1' siblings='3'/>
<cpu id='4' socket_id='2' core_id='0' siblings='4'/>
<cpu id='5' socket_id='2' core_id='1' siblings='5'/>
<cpu id='6' socket_id='3' core_id='0' siblings='6'/>
<cpu id='7' socket_id='3' core_id='1' siblings='7'/>
</cpus>
</cell>
</cells>
</topology>
<secmodel>
<model>selinux</model>
<doi>0</doi>
<baselabel type='kvm'>system_u:system_r:svirt_t:s0</baselabel>
<baselabel type='qemu'>system_u:system_r:svirt_tcg_t:s0</baselabel>
</secmodel>
<secmodel>
<model>dac</model>
<doi>0</doi>
<baselabel type='kvm'>+107:+107</baselabel>
<baselabel type='qemu'>+107:+107</baselabel>
</secmodel>
</host>
<guest>
<os_type>hvm</os_type>
<arch name='aarch64'>
<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<machine maxCpus='8'>virt</machine>
<machine maxCpus='1'>integratorcp</machine>
<machine maxCpus='2'>nuri</machine>
<machine maxCpus='1'>verdex</machine>
<machine maxCpus='2'>smdkc210</machine>
<machine maxCpus='1'>collie</machine>
<machine maxCpus='1'>spitz</machine>
<machine maxCpus='1'>realview-eb</machine>
<machine maxCpus='4'>realview-pbx-a9</machine>
<machine maxCpus='1'>versatilepb</machine>
<machine maxCpus='1'>realview-pb-a8</machine>
<machine maxCpus='1'>musicpal</machine>
<machine maxCpus='1'>z2</machine>
<machine maxCpus='1'>akita</machine>
<machine maxCpus='1'>kzm</machine>
<machine maxCpus='4'>realview-eb-mpcore</machine>
<machine maxCpus='1'>sx1</machine>
<machine maxCpus='1'>sx1-v1</machine>
<machine maxCpus='1'>cubieboard</machine>
<machine maxCpus='4'>highbank</machine>
<machine maxCpus='1'>netduino2</machine>
<machine maxCpus='1'>terrier</machine>
<machine maxCpus='1'>n810</machine>
<machine maxCpus='1'>mainstone</machine>
<machine maxCpus='4'>midway</machine>
<machine maxCpus='1'>cheetah</machine>
<machine maxCpus='1'>tosa</machine>
<machine maxCpus='4'>vexpress-a15</machine>
<machine maxCpus='1'>borzoi</machine>
<machine maxCpus='1'>versatileab</machine>
<machine maxCpus='1'>lm3s6965evb</machine>
<machine maxCpus='1'>n800</machine>
<machine maxCpus='1'>connex</machine>
<machine maxCpus='4'>vexpress-a9</machine>
<machine maxCpus='1'>xilinx-zynq-a9</machine>
<machine maxCpus='1'>canon-a1100</machine>
<machine maxCpus='1'>lm3s811evb</machine>
<domain type='qemu'/>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
</capabilities>

103
tests/capabilities-xml/kvm-armv7l.xml Normal file
View File

@ -0,0 +1,103 @@
<capabilities>
<!-- From Fedora 21 on cubietruck, libvirt 1.2.9.2 -->
<host>
<uuid>06bf8e5a-b512-4782-abbc-1ab7b6f008f4</uuid>
<cpu>
<arch>armv7l</arch>
<model>host</model>
<topology sockets='1' cores='2' threads='1'/>
<pages unit='KiB' size='4'/>
<pages unit='KiB' size='2048'/>
</cpu>
<power_management>
<suspend_disk/>
<suspend_hybrid/>
</power_management>
<migration_features>
<live/>
<uri_transports>
<uri_transport>tcp</uri_transport>
<uri_transport>rdma</uri_transport>
</uri_transports>
</migration_features>
<topology>
<cells num='1'>
<cell id='0'>
<memory unit='KiB'>2064964</memory>
<cpus num='2'>
<cpu id='0' socket_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' core_id='1' siblings='1'/>
</cpus>
</cell>
</cells>
</topology>
<secmodel>
<model>selinux</model>
<doi>0</doi>
<baselabel type='kvm'>system_u:system_r:svirt_t:s0</baselabel>
<baselabel type='qemu'>system_u:system_r:svirt_tcg_t:s0</baselabel>
</secmodel>
<secmodel>
<model>dac</model>
<doi>0</doi>
<baselabel type='kvm'>+107:+107</baselabel>
<baselabel type='qemu'>+107:+107</baselabel>
</secmodel>
</host>
<guest>
<os_type>hvm</os_type>
<arch name='armv7l'>
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-arm</emulator>
<machine maxCpus='1'>integratorcp</machine>
<machine maxCpus='2'>nuri</machine>
<machine maxCpus='1'>verdex</machine>
<machine maxCpus='2'>smdkc210</machine>
<machine maxCpus='1'>collie</machine>
<machine maxCpus='4'>virt</machine>
<machine maxCpus='1'>spitz</machine>
<machine maxCpus='4'>realview-pbx-a9</machine>
<machine maxCpus='1'>realview-eb</machine>
<machine maxCpus='1'>versatilepb</machine>
<machine maxCpus='1'>realview-pb-a8</machine>
<machine maxCpus='1'>musicpal</machine>
<machine maxCpus='1'>z2</machine>
<machine maxCpus='1'>akita</machine>
<machine maxCpus='1'>kzm</machine>
<machine maxCpus='4'>realview-eb-mpcore</machine>
<machine maxCpus='1'>sx1</machine>
<machine maxCpus='1'>sx1-v1</machine>
<machine maxCpus='1'>cubieboard</machine>
<machine maxCpus='4'>highbank</machine>
<machine maxCpus='1'>terrier</machine>
<machine maxCpus='1'>n810</machine>
<machine maxCpus='1'>mainstone</machine>
<machine maxCpus='4'>midway</machine>
<machine maxCpus='1'>cheetah</machine>
<machine maxCpus='1'>tosa</machine>
<machine maxCpus='1'>borzoi</machine>
<machine maxCpus='1'>versatileab</machine>
<machine maxCpus='1'>lm3s6965evb</machine>
<machine maxCpus='1'>n800</machine>
<machine maxCpus='1'>connex</machine>
<machine maxCpus='1'>xilinx-zynq-a9</machine>
<machine maxCpus='4'>vexpress-a9</machine>
<machine maxCpus='4'>vexpress-a15</machine>
<machine maxCpus='1'>canon-a1100</machine>
<machine maxCpus='1'>lm3s811evb</machine>
<domain type='qemu'>
</domain>
<domain type='kvm'>
<emulator>/usr/bin/qemu-system-arm</emulator>
</domain>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
</capabilities>

261
tests/capabilities-xml/kvm-ppc64le.xml Normal file
View File

@ -0,0 +1,261 @@
<capabilities>
<!-- From RHEL7.2 development, libvirt-daemon-1.2.14-1.ael7b.ppc64le -->
<host>
<uuid>a8726024-45c0-4b62-b631-14fbb6d75b9e</uuid>
<cpu>
<arch>ppc64le</arch>
<model>power8e</model>
<vendor>IBM</vendor>
<topology sockets='1' cores='160' threads='1'/>
<pages unit='KiB' size='64'/>
<pages unit='KiB' size='16384'/>
<pages unit='KiB' size='16777216'/>
</cpu>
<power_management>
<suspend_mem/>
<suspend_disk/>
<suspend_hybrid/>
</power_management>
<migration_features>
<live/>
<uri_transports>
<uri_transport>tcp</uri_transport>
<uri_transport>rdma</uri_transport>
</uri_transports>
</migration_features>
<topology>
<cells num='4'>
<cell id='0'>
<memory unit='KiB'>67108864</memory>
<pages unit='KiB' size='64'>1048576</pages>
<pages unit='KiB' size='16384'>0</pages>
<pages unit='KiB' size='16777216'>0</pages>
<distances>
<sibling id='0' value='10'/>
<sibling id='1' value='20'/>
<sibling id='16' value='40'/>
<sibling id='17' value='40'/>
</distances>
<cpus num='24'>
<cpu id='0' socket_id='0' core_id='32' siblings='0'/>
<cpu id='8' socket_id='0' core_id='40' siblings='8'/>
<cpu id='16' socket_id='0' core_id='96' siblings='16'/>
<cpu id='19'/>
<cpu id='20'/>
<cpu id='21'/>
<cpu id='22'/>
<cpu id='23'/>
<cpu id='24' socket_id='0' core_id='104' siblings='24'/>
<cpu id='25'/>
<cpu id='26'/>
<cpu id='27'/>
<cpu id='28'/>
<cpu id='29'/>
<cpu id='30'/>
<cpu id='31'/>
<cpu id='32' socket_id='0' core_id='112' siblings='32'/>
<cpu id='33'/>
<cpu id='34'/>
<cpu id='35'/>
<cpu id='36'/>
<cpu id='37'/>
<cpu id='38'/>
<cpu id='39'/>
</cpus>
</cell>
<cell id='1'>
<memory unit='KiB'>67108864</memory>
<pages unit='KiB' size='64'>1048576</pages>
<pages unit='KiB' size='16384'>0</pages>
<pages unit='KiB' size='16777216'>0</pages>
<distances>
<sibling id='0' value='20'/>
<sibling id='1' value='10'/>
<sibling id='16' value='40'/>
<sibling id='17' value='40'/>
</distances>
<cpus num='40'>
<cpu id='40' socket_id='1' core_id='160' siblings='40'/>
<cpu id='41'/>
<cpu id='42'/>
<cpu id='43'/>
<cpu id='44'/>
<cpu id='45'/>
<cpu id='46'/>
<cpu id='47'/>
<cpu id='48' socket_id='1' core_id='176' siblings='48'/>
<cpu id='49'/>
<cpu id='50'/>
<cpu id='51'/>
<cpu id='52'/>
<cpu id='53'/>
<cpu id='54'/>
<cpu id='55'/>
<cpu id='56' socket_id='1' core_id='224' siblings='56'/>
<cpu id='57'/>
<cpu id='58'/>
<cpu id='59'/>
<cpu id='60'/>
<cpu id='61'/>
<cpu id='62'/>
<cpu id='63'/>
<cpu id='64' socket_id='1' core_id='232' siblings='64'/>
<cpu id='65'/>
<cpu id='66'/>
<cpu id='67'/>
<cpu id='68'/>
<cpu id='69'/>
<cpu id='70'/>
<cpu id='71'/>
<cpu id='72' socket_id='1' core_id='240' siblings='72'/>
<cpu id='73'/>
<cpu id='74'/>
<cpu id='75'/>
<cpu id='76'/>
<cpu id='77'/>
<cpu id='78'/>
<cpu id='79'/>
</cpus>
</cell>
<cell id='16'>
<memory unit='KiB'>67108864</memory>
<pages unit='KiB' size='64'>1048576</pages>
<pages unit='KiB' size='16384'>0</pages>
<pages unit='KiB' size='16777216'>0</pages>
<distances>
<sibling id='0' value='40'/>
<sibling id='1' value='40'/>
<sibling id='16' value='10'/>
<sibling id='17' value='20'/>
</distances>
<cpus num='40'>
<cpu id='80' socket_id='16' core_id='2088' siblings='80'/>
<cpu id='81'/>
<cpu id='82'/>
<cpu id='83'/>
<cpu id='84'/>
<cpu id='85'/>
<cpu id='86'/>
<cpu id='87'/>
<cpu id='88' socket_id='16' core_id='2096' siblings='88'/>
<cpu id='89'/>
<cpu id='90'/>
<cpu id='91'/>
<cpu id='92'/>
<cpu id='93'/>
<cpu id='94'/>
<cpu id='95'/>
<cpu id='96' socket_id='16' core_id='2144' siblings='96'/>
<cpu id='97'/>
<cpu id='98'/>
<cpu id='99'/>
<cpu id='100'/>
<cpu id='101'/>
<cpu id='102'/>
<cpu id='103'/>
<cpu id='104' socket_id='16' core_id='2152' siblings='104'/>
<cpu id='105'/>
<cpu id='106'/>
<cpu id='107'/>
<cpu id='108'/>
<cpu id='109'/>
<cpu id='110'/>
<cpu id='111'/>
<cpu id='112' socket_id='16' core_id='2160' siblings='112'/>
<cpu id='113'/>
<cpu id='114'/>
<cpu id='115'/>
<cpu id='116'/>
<cpu id='117'/>
<cpu id='118'/>
<cpu id='119'/>
</cpus>
</cell>
<cell id='17'>
<memory unit='KiB'>67108864</memory>
<pages unit='KiB' size='64'>1048576</pages>
<pages unit='KiB' size='16384'>0</pages>
<pages unit='KiB' size='16777216'>0</pages>
<distances>
<sibling id='0' value='40'/>
<sibling id='1' value='40'/>
<sibling id='16' value='20'/>
<sibling id='17' value='10'/>
</distances>
<cpus num='40'>
<cpu id='120' socket_id='17' core_id='2208' siblings='120'/>
<cpu id='121'/>
<cpu id='122'/>
<cpu id='123'/>
<cpu id='124'/>
<cpu id='125'/>
<cpu id='126'/>
<cpu id='127'/>
<cpu id='128' socket_id='17' core_id='2224' siblings='128'/>
<cpu id='129'/>
<cpu id='130'/>
<cpu id='131'/>
<cpu id='132'/>
<cpu id='133'/>
<cpu id='134'/>
<cpu id='135'/>
<cpu id='136' socket_id='17' core_id='2272' siblings='136'/>
<cpu id='137'/>
<cpu id='138'/>
<cpu id='139'/>
<cpu id='140'/>
<cpu id='141'/>
<cpu id='142'/>
<cpu id='143'/>
<cpu id='144' socket_id='17' core_id='2280' siblings='144'/>
<cpu id='145'/>
<cpu id='146'/>
<cpu id='147'/>
<cpu id='148'/>
<cpu id='149'/>
<cpu id='150'/>
<cpu id='151'/>
<cpu id='152' socket_id='17' core_id='2288' siblings='152'/>
<cpu id='153'/>
<cpu id='154'/>
<cpu id='155'/>
<cpu id='156'/>
<cpu id='157'/>
<cpu id='158'/>
<cpu id='159'/>
</cpus>
</cell>
</cells>
</topology>
<secmodel>
<model>none</model>
<doi>0</doi>
</secmodel>
<secmodel>
<model>dac</model>
<doi>0</doi>
<baselabel type='kvm'>+107:+107</baselabel>
<baselabel type='qemu'>+107:+107</baselabel>
</secmodel>
</host>
<guest>
<os_type>hvm</os_type>
<arch name='ppc64le'>
<wordsize>64</wordsize>
<emulator>/usr/libexec/qemu-kvm</emulator>
<machine canonical='pseries-rhel7.1.0' maxCpus='255'>pseries</machine>
<domain type='qemu'/>
<domain type='kvm'>
<emulator>/usr/libexec/qemu-kvm</emulator>
</domain>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
</capabilities>

0
tests/capabilities-xml/domcapabilities-1.2.12-aavmf.xml → tests/capabilities-xml/kvm-x86_64-domcaps.xml
View File

1
tests/capabilities-xml/caps-libvirt-1.1.1-29.el7.xml → tests/capabilities-xml/kvm-x86_64-rhel7.xml
View File

@ -1,4 +1,5 @@
<capabilities>
<!-- From libvirt-1.1.1-29 -->
<host>
<uuid>b1517723-d556-41ee-8f77-ef18afe127d1</uuid>

591
tests/capabilities-xml/libvirt-1.1.2-qemu-caps.xml → tests/capabilities-xml/kvm-x86_64.xml
View File

@ -1,25 +1,34 @@
<capabilities>
<!-- From Fedora 22 beta, libvirt-daemon-1.2.13-3.fc22.x86_64 -->
<host>
<uuid>39303242-3334-3636-3341-3745ffffffff</uuid>
<cpu>
<arch>x86_64</arch>
<model>core2duo</model>
<vendor>Intel</vendor>
<topology sockets='7' cores='5' threads='3'/>
<feature name='lahf_lm'/>
<feature name='xtpr'/>
<feature name='cx16'/>
<feature name='tm2'/>
<feature name='est'/>
<feature name='vmx'/>
<feature name='ds_cpl'/>
<feature name='pbe'/>
<feature name='tm'/>
<model>Opteron_G4</model>
<vendor>AMD</vendor>
<topology sockets='1' cores='8' threads='1'/>
<feature name='invtsc'/>
<feature name='perfctr_nb'/>
<feature name='perfctr_core'/>
<feature name='topoext'/>
<feature name='nodeid_msr'/>
<feature name='lwp'/>
<feature name='wdt'/>
<feature name='skinit'/>
<feature name='ibs'/>
<feature name='osvw'/>
<feature name='cr8legacy'/>
<feature name='extapic'/>
<feature name='cmp_legacy'/>
<feature name='fxsr_opt'/>
<feature name='mmxext'/>
<feature name='osxsave'/>
<feature name='monitor'/>
<feature name='ht'/>
<feature name='ss'/>
<feature name='acpi'/>
<feature name='ds'/>
<feature name='vme'/>
<pages unit='KiB' size='4'/>
<pages unit='KiB' size='2048'/>
</cpu>
<power_management>
<suspend_mem/>
@ -30,21 +39,27 @@
<live/>
<uri_transports>
<uri_transport>tcp</uri_transport>
<uri_transport>rdma</uri_transport>
</uri_transports>
</migration_features>
<topology>
<cells num='1'>
<cell id='0'>
<memory unit='KiB'>16757988</memory>
<memory unit='KiB'>16414544</memory>
<pages unit='KiB' size='4'>4103636</pages>
<pages unit='KiB' size='2048'>0</pages>
<distances>
<sibling id='0' value='10'/>
</distances>
<cpus num='8'>
<cpu id='0' socket_id='0' core_id='0' siblings='0-1'/>
<cpu id='1' socket_id='0' core_id='1' siblings='0-1'/>
<cpu id='2' socket_id='0' core_id='5' siblings='2,5'/>
<cpu id='3' socket_id='0' core_id='7' siblings='3-4'/>
<cpu id='4' socket_id='0' core_id='6' siblings='3-4'/>
<cpu id='5' socket_id='0' core_id='4' siblings='2,5'/>
<cpu id='6' socket_id='0' core_id='3' siblings='6-7'/>
<cpu id='7' socket_id='0' core_id='2' siblings='6-7'/>
<cpu id='0' socket_id='0' core_id='0' siblings='0,3'/>
<cpu id='1' socket_id='0' core_id='3' siblings='1,4'/>
<cpu id='2' socket_id='0' core_id='7' siblings='2,5'/>
<cpu id='3' socket_id='0' core_id='1' siblings='0,3'/>
<cpu id='4' socket_id='0' core_id='2' siblings='1,4'/>
<cpu id='5' socket_id='0' core_id='6' siblings='2,5'/>
<cpu id='6' socket_id='0' core_id='4' siblings='6-7'/>
<cpu id='7' socket_id='0' core_id='5' siblings='6-7'/>
</cpus>
</cell>
</cells>
@ -52,10 +67,14 @@
<secmodel>
<model>selinux</model>
<doi>0</doi>
<baselabel type='kvm'>system_u:system_r:svirt_t:s0</baselabel>
<baselabel type='qemu'>system_u:system_r:svirt_tcg_t:s0</baselabel>
</secmodel>
<secmodel>
<model>dac</model>
<doi>0</doi>
<baselabel type='kvm'>+107:+107</baselabel>
<baselabel type='qemu'>+107:+107</baselabel>
</secmodel>
</host>
@ -65,12 +84,11 @@
<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-alpha</emulator>
<machine maxCpus='4'>clipper</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -79,63 +97,15 @@
<arch name='armv7l'>
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-arm</emulator>
<machine maxCpus='1'>integratorcp</machine>
<machine maxCpus='1'>z2</machine>
<machine maxCpus='1'>xilinx-zynq-a9</machine>
<machine maxCpus='4'>vexpress-a15</machine>
<machine maxCpus='4'>vexpress-a9</machine>
<machine maxCpus='1'>versatileab</machine>
<machine maxCpus='1'>versatilepb</machine>
<machine maxCpus='4'>virt</machine>
<machine maxCpus='1'>tosa</machine>
<machine maxCpus='1'>lm3s6965evb</machine>
<machine maxCpus='1'>lm3s811evb</machine>
<machine maxCpus='1'>terrier</machine>
<machine maxCpus='1'>borzoi</machine>
<machine maxCpus='1'>spitz</machine>
<machine maxCpus='1'>akita</machine>
<machine maxCpus='4'>realview-pbx-a9</machine>
<machine maxCpus='1'>realview-pb-a8</machine>
<machine maxCpus='4'>realview-eb-mpcore</machine>
<machine maxCpus='1'>realview-eb</machine>
<machine maxCpus='1'>cheetah</machine>
<machine maxCpus='1'>sx1-v1</machine>
<machine maxCpus='1'>sx1</machine>
<machine maxCpus='1'>n810</machine>
<machine maxCpus='1'>n800</machine>
<machine maxCpus='1'>musicpal</machine>
<machine maxCpus='1'>mainstone</machine>
<machine maxCpus='1'>kzm</machine>
<machine maxCpus='4'>midway</machine>
<machine maxCpus='4'>highbank</machine>
<machine maxCpus='1'>verdex</machine>
<machine maxCpus='1'>connex</machine>
<machine maxCpus='2'>smdkc210</machine>
<machine maxCpus='2'>nuri</machine>
<machine maxCpus='1'>collie</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
</arch>
<features>
<deviceboot/>
</features>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name='aarch64'>
<wordsize>64</wordsize>
<emulator>/bin/qemu-system-aarch64</emulator>
<machine maxCpus='8'>virt</machine>
<machine maxCpus='1'>integratorcp</machine>
<machine maxCpus='2'>nuri</machine>
<machine maxCpus='1'>verdex</machine>
<machine maxCpus='2'>smdkc210</machine>
<machine maxCpus='1'>collie</machine>
<machine maxCpus='4'>virt</machine>
<machine maxCpus='1'>spitz</machine>
<machine maxCpus='4'>realview-pbx-a9</machine>
<machine maxCpus='1'>realview-eb</machine>
<machine maxCpus='4'>realview-pbx-a9</machine>
<machine maxCpus='1'>versatilepb</machine>
<machine maxCpus='1'>realview-pb-a8</machine>
<machine maxCpus='1'>musicpal</machine>
@ -147,24 +117,75 @@
<machine maxCpus='1'>sx1-v1</machine>
<machine maxCpus='1'>cubieboard</machine>
<machine maxCpus='4'>highbank</machine>
<machine maxCpus='1'>netduino2</machine>
<machine maxCpus='1'>terrier</machine>
<machine maxCpus='1'>n810</machine>
<machine maxCpus='1'>mainstone</machine>
<machine maxCpus='4'>midway</machine>
<machine maxCpus='1'>cheetah</machine>
<machine maxCpus='1'>tosa</machine>
<machine maxCpus='4'>vexpress-a15</machine>
<machine maxCpus='1'>borzoi</machine>
<machine maxCpus='1'>versatileab</machine>
<machine maxCpus='1'>lm3s6965evb</machine>
<machine maxCpus='1'>n800</machine>
<machine maxCpus='1'>connex</machine>
<machine maxCpus='1'>xilinx-zynq-a9</machine>
<machine maxCpus='4'>vexpress-a9</machine>
<machine maxCpus='4'>vexpress-a15</machine>
<machine maxCpus='1'>xilinx-zynq-a9</machine>
<machine maxCpus='1'>canon-a1100</machine>
<machine maxCpus='1'>lm3s811evb</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name='aarch64'>
<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<machine maxCpus='8'>virt</machine>
<machine maxCpus='1'>integratorcp</machine>
<machine maxCpus='2'>nuri</machine>
<machine maxCpus='1'>verdex</machine>
<machine maxCpus='2'>smdkc210</machine>
<machine maxCpus='1'>collie</machine>
<machine maxCpus='1'>spitz</machine>
<machine maxCpus='1'>realview-eb</machine>
<machine maxCpus='4'>realview-pbx-a9</machine>
<machine maxCpus='1'>versatilepb</machine>
<machine maxCpus='1'>realview-pb-a8</machine>
<machine maxCpus='1'>musicpal</machine>
<machine maxCpus='1'>z2</machine>
<machine maxCpus='1'>akita</machine>
<machine maxCpus='1'>kzm</machine>
<machine maxCpus='4'>realview-eb-mpcore</machine>
<machine maxCpus='1'>sx1</machine>
<machine maxCpus='1'>sx1-v1</machine>
<machine maxCpus='1'>cubieboard</machine>
<machine maxCpus='4'>highbank</machine>
<machine maxCpus='1'>netduino2</machine>
<machine maxCpus='1'>terrier</machine>
<machine maxCpus='1'>n810</machine>
<machine maxCpus='1'>mainstone</machine>
<machine maxCpus='4'>midway</machine>
<machine maxCpus='1'>cheetah</machine>
<machine maxCpus='1'>tosa</machine>
<machine maxCpus='4'>vexpress-a15</machine>
<machine maxCpus='1'>borzoi</machine>
<machine maxCpus='1'>versatileab</machine>
<machine maxCpus='1'>lm3s6965evb</machine>
<machine maxCpus='1'>n800</machine>
<machine maxCpus='1'>connex</machine>
<machine maxCpus='4'>vexpress-a9</machine>
<machine maxCpus='1'>xilinx-zynq-a9</machine>
<machine maxCpus='1'>canon-a1100</machine>
<machine maxCpus='1'>lm3s811evb</machine>
<domain type='qemu'/>
</arch>
<features>
<cpuselection/>
@ -179,10 +200,11 @@
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-cris</emulator>
<machine maxCpus='1'>axis-dev88</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
@ -190,51 +212,73 @@
<arch name='i686'>
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-i386</emulator>
<machine canonical='pc-i440fx-1.6' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-q35-1.4</machine>
<machine maxCpus='255'>pc-q35-1.5</machine>
<machine canonical='pc-q35-1.6' maxCpus='255'>q35</machine>
<machine maxCpus='1'>isapc</machine>
<machine maxCpus='255'>pc-0.10</machine>
<machine maxCpus='255'>pc-0.11</machine>
<machine canonical='pc-i440fx-2.3' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-0.12</machine>
<machine maxCpus='255'>pc-0.13</machine>
<machine maxCpus='255'>pc-0.14</machine>
<machine maxCpus='255'>pc-0.15</machine>
<machine maxCpus='255'>pc-1.0</machine>
<machine maxCpus='255'>pc-1.1</machine>
<machine maxCpus='255'>pc-1.2</machine>
<machine maxCpus='255'>pc-1.3</machine>
<machine maxCpus='255'>pc-i440fx-1.4</machine>
<machine maxCpus='255'>pc-q35-1.6</machine>
<machine maxCpus='255'>pc-q35-1.5</machine>
<machine maxCpus='255'>pc-i440fx-1.6</machine>
<machine maxCpus='255'>pc-q35-2.2</machine>
<machine maxCpus='1'>xenpv</machine>
<machine maxCpus='255'>pc-i440fx-1.7</machine>
<machine maxCpus='255'>pc-q35-2.1</machine>
<machine maxCpus='255'>pc-0.11</machine>
<machine maxCpus='255'>pc-0.10</machine>
<machine maxCpus='255'>pc-1.2</machine>
<machine maxCpus='255'>pc-i440fx-2.2</machine>
<machine maxCpus='1'>isapc</machine>
<machine maxCpus='255'>pc-q35-1.4</machine>
<machine maxCpus='128'>xenfv</machine>
<machine maxCpus='255'>pc-0.15</machine>
<machine maxCpus='255'>pc-i440fx-1.5</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='255'>pc-0.14</machine>
<machine maxCpus='255'>pc-i440fx-1.4</machine>
<machine maxCpus='255'>pc-q35-2.0</machine>
<machine maxCpus='255'>pc-1.1</machine>
<machine maxCpus='255'>pc-q35-1.7</machine>
<machine maxCpus='255'>pc-i440fx-2.1</machine>
<machine maxCpus='255'>pc-1.0</machine>
<machine maxCpus='255'>pc-i440fx-2.0</machine>
<machine canonical='pc-q35-2.3' maxCpus='255'>q35</machine>
<machine maxCpus='255'>pc-0.13</machine>
<domain type='qemu'/>
<domain type='kvm'>
<emulator>/usr/bin/qemu-kvm</emulator>
<machine canonical='pc-i440fx-1.6' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-q35-1.4</machine>
<machine maxCpus='255'>pc-q35-1.5</machine>
<machine canonical='pc-q35-1.6' maxCpus='255'>q35</machine>
<machine maxCpus='1'>isapc</machine>
<machine maxCpus='255'>pc-0.10</machine>
<machine maxCpus='255'>pc-0.11</machine>
<machine maxCpus='255'>pc-0.12</machine>
<machine maxCpus='255'>pc-0.13</machine>
<machine maxCpus='255'>pc-0.14</machine>
<machine maxCpus='255'>pc-0.15</machine>
<machine maxCpus='255'>pc-1.0</machine>
<machine maxCpus='255'>pc-1.1</machine>
<machine maxCpus='255'>pc-1.2</machine>
<machine canonical='pc-i440fx-2.3' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-1.3</machine>
<machine maxCpus='255'>pc-i440fx-1.4</machine>
<machine maxCpus='255'>pc-0.12</machine>
<machine maxCpus='255'>pc-q35-1.6</machine>
<machine maxCpus='255'>pc-q35-1.5</machine>
<machine maxCpus='255'>pc-i440fx-1.6</machine>
<machine maxCpus='255'>pc-q35-2.2</machine>
<machine maxCpus='255'>pc-i440fx-1.7</machine>
<machine maxCpus='1'>xenpv</machine>
<machine maxCpus='255'>pc-q35-2.1</machine>
<machine maxCpus='255'>pc-0.11</machine>
<machine maxCpus='255'>pc-0.10</machine>
<machine maxCpus='255'>pc-i440fx-2.2</machine>
<machine maxCpus='255'>pc-1.2</machine>
<machine maxCpus='1'>isapc</machine>
<machine maxCpus='255'>pc-q35-1.4</machine>
<machine maxCpus='128'>xenfv</machine>
<machine maxCpus='255'>pc-0.15</machine>
<machine maxCpus='255'>pc-i440fx-1.5</machine>
<machine maxCpus='1'>none</machine>
<machine maxCpus='255'>pc-i440fx-1.4</machine>
<machine maxCpus='255'>pc-q35-2.0</machine>
<machine maxCpus='255'>pc-0.14</machine>
<machine maxCpus='255'>pc-1.1</machine>
<machine maxCpus='255'>pc-q35-1.7</machine>
<machine maxCpus='255'>pc-i440fx-2.1</machine>
<machine maxCpus='255'>pc-1.0</machine>
<machine maxCpus='255'>pc-i440fx-2.0</machine>
<machine canonical='pc-q35-2.3' maxCpus='255'>q35</machine>
<machine maxCpus='255'>pc-0.13</machine>
</domain>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
<acpi default='on' toggle='yes'/>
<apic default='on' toggle='no'/>
<pae/>
@ -250,10 +294,11 @@
<machine maxCpus='1'>lm32-evr</machine>
<machine maxCpus='1'>milkymist</machine>
<machine maxCpus='1'>lm32-uclinux</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
@ -264,12 +309,11 @@
<machine maxCpus='1'>mcf5208evb</machine>
<machine maxCpus='1'>dummy</machine>
<machine maxCpus='1'>an5206</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -280,10 +324,11 @@
<emulator>/usr/bin/qemu-system-microblaze</emulator>
<machine maxCpus='1'>petalogix-s3adsp1800</machine>
<machine maxCpus='1'>petalogix-ml605</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
@ -293,10 +338,11 @@
<emulator>/usr/bin/qemu-system-microblazeel</emulator>
<machine maxCpus='1'>petalogix-s3adsp1800</machine>
<machine maxCpus='1'>petalogix-ml605</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
@ -307,14 +353,13 @@
<machine maxCpus='16'>malta</machine>
<machine maxCpus='1'>mips</machine>
<machine maxCpus='1'>mipssim</machine>
<machine maxCpus='1'>pica61</machine>
<machine maxCpus='1'>magnum</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='1'>pica61</machine>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -326,14 +371,13 @@
<machine maxCpus='16'>malta</machine>
<machine maxCpus='1'>mips</machine>
<machine maxCpus='1'>mipssim</machine>
<machine maxCpus='1'>pica61</machine>
<machine maxCpus='1'>magnum</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='1'>pica61</machine>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -345,14 +389,13 @@
<machine maxCpus='16'>malta</machine>
<machine maxCpus='1'>mips</machine>
<machine maxCpus='1'>mipssim</machine>
<machine maxCpus='1'>pica61</machine>
<machine maxCpus='1'>magnum</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='1'>pica61</machine>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -363,16 +406,15 @@
<emulator>/usr/bin/qemu-system-mips64el</emulator>
<machine maxCpus='16'>malta</machine>
<machine maxCpus='1'>mips</machine>
<machine maxCpus='1'>magnum</machine>
<machine maxCpus='1'>mipssim</machine>
<machine maxCpus='1'>pica61</machine>
<machine maxCpus='1'>magnum</machine>
<machine maxCpus='1'>fulong2e</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -382,21 +424,20 @@
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-ppc</emulator>
<machine maxCpus='1'>g3beige</machine>
<machine maxCpus='1'>virtex-ml507</machine>
<machine maxCpus='1'>prep</machine>
<machine maxCpus='1'>bamboo</machine>
<machine maxCpus='1'>taihu</machine>
<machine maxCpus='1'>ref405ep</machine>
<machine maxCpus='15'>mpc8544ds</machine>
<machine maxCpus='1'>mac99</machine>
<machine maxCpus='1'>virtex-ml507</machine>
<machine maxCpus='32'>ppce500</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='15'>mpc8544ds</machine>
<machine maxCpus='1'>bamboo</machine>
<machine maxCpus='1'>prep</machine>
<machine maxCpus='1'>mac99</machine>
<machine maxCpus='1'>taihu</machine>
<domain type='qemu'/>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -405,23 +446,50 @@
<arch name='ppc64'>
<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
<machine maxCpus='256'>pseries</machine>
<machine maxCpus='1'>virtex-ml507</machine>
<machine maxCpus='1'>prep</machine>
<machine maxCpus='1'>bamboo</machine>
<machine maxCpus='1'>taihu</machine>
<machine canonical='pseries-2.3' maxCpus='255'>pseries</machine>
<machine maxCpus='1'>ref405ep</machine>
<machine maxCpus='15'>mpc8544ds</machine>
<machine maxCpus='1'>g3beige</machine>
<machine maxCpus='1'>mac99</machine>
<machine maxCpus='1'>virtex-ml507</machine>
<machine maxCpus='32'>ppce500</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='15'>mpc8544ds</machine>
<machine maxCpus='1'>bamboo</machine>
<machine maxCpus='1'>g3beige</machine>
<machine maxCpus='1'>prep</machine>
<machine maxCpus='255'>pseries-2.1</machine>
<machine maxCpus='255'>pseries-2.2</machine>
<machine maxCpus='1'>mac99</machine>
<machine maxCpus='1'>taihu</machine>
<domain type='qemu'/>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name='ppc64le'>
<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
<machine canonical='pseries-2.3' maxCpus='255'>pseries</machine>
<machine maxCpus='1'>ref405ep</machine>
<machine maxCpus='1'>virtex-ml507</machine>
<machine maxCpus='32'>ppce500</machine>
<machine maxCpus='15'>mpc8544ds</machine>
<machine maxCpus='1'>bamboo</machine>
<machine maxCpus='1'>g3beige</machine>
<machine maxCpus='1'>prep</machine>
<machine maxCpus='255'>pseries-2.1</machine>
<machine maxCpus='255'>pseries-2.2</machine>
<machine maxCpus='1'>mac99</machine>
<machine maxCpus='1'>taihu</machine>
<domain type='qemu'/>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -430,22 +498,16 @@
<arch name='ppcemb'>
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-ppcemb</emulator>
<machine maxCpus='1'>g3beige</machine>
<machine maxCpus='1'>ref405ep</machine>
<machine maxCpus='1'>virtex-ml507</machine>
<machine maxCpus='1'>prep</machine>
<machine maxCpus='1'>bamboo</machine>
<machine maxCpus='1'>taihu</machine>
<machine maxCpus='1'>ref405ep</machine>
<machine maxCpus='15'>mpc8544ds</machine>
<machine maxCpus='1'>mac99</machine>
<machine maxCpus='32'>ppce500</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -456,13 +518,12 @@
<emulator>/usr/bin/qemu-system-s390x</emulator>
<machine canonical='s390-virtio' maxCpus='255'>s390</machine>
<machine canonical='s390-ccw-virtio' maxCpus='255'>s390-ccw</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -473,12 +534,11 @@
<emulator>/usr/bin/qemu-system-sh4</emulator>
<machine maxCpus='1'>shix</machine>
<machine maxCpus='1'>r2d</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -489,12 +549,11 @@
<emulator>/usr/bin/qemu-system-sh4eb</emulator>
<machine maxCpus='1'>shix</machine>
<machine maxCpus='1'>r2d</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -504,19 +563,20 @@
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-sparc</emulator>
<machine maxCpus='1'>SS-5</machine>
<machine maxCpus='1'>SPARCbook</machine>
<machine maxCpus='1'>SPARCClassic</machine>
<machine maxCpus='1'>SS-4</machine>
<machine maxCpus='1'>LX</machine>
<machine maxCpus='1'>Voyager</machine>
<machine maxCpus='4'>SS-20</machine>
<machine maxCpus='1'>SPARCbook</machine>
<machine maxCpus='4'>SS-600MP</machine>
<machine maxCpus='1'>Voyager</machine>
<machine maxCpus='4'>SS-10</machine>
<machine maxCpus='1'>SPARCClassic</machine>
<machine maxCpus='4'>SS-20</machine>
<machine maxCpus='1'>leon3_generic</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='1'>LX</machine>
<domain type='qemu'/>
</arch>
<features>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
@ -527,12 +587,11 @@
<machine maxCpus='1'>sun4u</machine>
<machine maxCpus='1'>Niagara</machine>
<machine maxCpus='1'>sun4v</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
@ -542,10 +601,11 @@
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-unicore32</emulator>
<machine maxCpus='1'>puv3</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<domain type='qemu'/>
</arch>
<features>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
@ -553,51 +613,73 @@
<arch name='x86_64'>
<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<machine canonical='pc-i440fx-1.6' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-q35-1.4</machine>
<machine maxCpus='255'>pc-q35-1.5</machine>
<machine canonical='pc-q35-1.6' maxCpus='255'>q35</machine>
<machine maxCpus='1'>isapc</machine>
<machine maxCpus='255'>pc-0.10</machine>
<machine maxCpus='255'>pc-0.11</machine>
<machine maxCpus='255'>pc-0.12</machine>
<machine maxCpus='255'>pc-0.13</machine>
<machine maxCpus='255'>pc-0.14</machine>
<machine maxCpus='255'>pc-0.15</machine>
<machine maxCpus='255'>pc-1.0</machine>
<machine maxCpus='255'>pc-1.1</machine>
<machine maxCpus='255'>pc-1.2</machine>
<machine canonical='pc-i440fx-2.3' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-1.3</machine>
<machine maxCpus='255'>pc-i440fx-1.4</machine>
<machine maxCpus='255'>pc-0.12</machine>
<machine maxCpus='255'>pc-q35-1.6</machine>
<machine maxCpus='255'>pc-q35-1.5</machine>
<machine maxCpus='255'>pc-i440fx-1.6</machine>
<machine maxCpus='255'>pc-q35-2.2</machine>
<machine maxCpus='255'>pc-i440fx-1.7</machine>
<machine maxCpus='1'>xenpv</machine>
<machine maxCpus='255'>pc-q35-2.1</machine>
<machine maxCpus='255'>pc-0.11</machine>
<machine maxCpus='255'>pc-0.10</machine>
<machine maxCpus='255'>pc-i440fx-2.2</machine>
<machine maxCpus='255'>pc-1.2</machine>
<machine maxCpus='1'>isapc</machine>
<machine maxCpus='255'>pc-q35-1.4</machine>
<machine maxCpus='128'>xenfv</machine>
<machine maxCpus='255'>pc-0.15</machine>
<machine maxCpus='255'>pc-i440fx-1.5</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='255'>pc-i440fx-1.4</machine>
<machine maxCpus='255'>pc-q35-2.0</machine>
<machine maxCpus='255'>pc-0.14</machine>
<machine maxCpus='255'>pc-1.1</machine>
<machine maxCpus='255'>pc-q35-1.7</machine>
<machine maxCpus='255'>pc-i440fx-2.1</machine>
<machine maxCpus='255'>pc-1.0</machine>
<machine maxCpus='255'>pc-i440fx-2.0</machine>
<machine canonical='pc-q35-2.3' maxCpus='255'>q35</machine>
<machine maxCpus='255'>pc-0.13</machine>
<domain type='qemu'/>
<domain type='kvm'>
<emulator>/usr/bin/qemu-kvm</emulator>
<machine canonical='pc-i440fx-1.6' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-q35-1.4</machine>
<machine maxCpus='255'>pc-q35-1.5</machine>
<machine canonical='pc-q35-1.6' maxCpus='255'>q35</machine>
<machine maxCpus='1'>isapc</machine>
<machine maxCpus='255'>pc-0.10</machine>
<machine maxCpus='255'>pc-0.11</machine>
<machine maxCpus='255'>pc-0.12</machine>
<machine maxCpus='255'>pc-0.13</machine>
<machine maxCpus='255'>pc-0.14</machine>
<machine maxCpus='255'>pc-0.15</machine>
<machine maxCpus='255'>pc-1.0</machine>
<machine maxCpus='255'>pc-1.1</machine>
<machine maxCpus='255'>pc-1.2</machine>
<machine canonical='pc-i440fx-2.3' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-1.3</machine>
<machine maxCpus='255'>pc-i440fx-1.4</machine>
<machine maxCpus='255'>pc-0.12</machine>
<machine maxCpus='255'>pc-q35-1.6</machine>
<machine maxCpus='255'>pc-q35-1.5</machine>
<machine maxCpus='255'>pc-i440fx-1.6</machine>
<machine maxCpus='255'>pc-q35-2.2</machine>
<machine maxCpus='255'>pc-i440fx-1.7</machine>
<machine maxCpus='1'>xenpv</machine>
<machine maxCpus='255'>pc-q35-2.1</machine>
<machine maxCpus='255'>pc-0.11</machine>
<machine maxCpus='255'>pc-0.10</machine>
<machine maxCpus='255'>pc-i440fx-2.2</machine>
<machine maxCpus='255'>pc-1.2</machine>
<machine maxCpus='1'>isapc</machine>
<machine maxCpus='255'>pc-q35-1.4</machine>
<machine maxCpus='128'>xenfv</machine>
<machine maxCpus='255'>pc-0.15</machine>
<machine maxCpus='255'>pc-i440fx-1.5</machine>
<machine maxCpus='1'>none</machine>
<machine maxCpus='255'>pc-i440fx-1.4</machine>
<machine maxCpus='255'>pc-q35-2.0</machine>
<machine maxCpus='255'>pc-0.14</machine>
<machine maxCpus='255'>pc-1.1</machine>
<machine maxCpus='255'>pc-q35-1.7</machine>
<machine maxCpus='255'>pc-i440fx-2.1</machine>
<machine maxCpus='255'>pc-1.0</machine>
<machine maxCpus='255'>pc-i440fx-2.0</machine>
<machine canonical='pc-q35-2.3' maxCpus='255'>q35</machine>
<machine maxCpus='255'>pc-0.13</machine>
</domain>
</arch>
<features>
<cpuselection/>
<deviceboot/>
<disksnapshot default='on' toggle='no'/>
<acpi default='on' toggle='yes'/>
<apic default='on' toggle='no'/>
</features>
@ -609,12 +691,15 @@
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-xtensa</emulator>
<machine maxCpus='4'>sim</machine>
<machine maxCpus='4'>kc705</machine>
<machine maxCpus='4'>lx200</machine>
<machine maxCpus='4'>lx60</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
<machine maxCpus='4'>ml605</machine>
<domain type='qemu'/>
</arch>
<features>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
@ -623,45 +708,15 @@
<wordsize>32</wordsize>
<emulator>/usr/bin/qemu-system-xtensaeb</emulator>
<machine maxCpus='4'>sim</machine>
<machine maxCpus='4'>kc705</machine>
<machine maxCpus='4'>lx200</machine>
<machine maxCpus='4'>lx60</machine>
<machine maxCpus='1'>none</machine>
<domain type='qemu'>
</domain>
</arch>
</guest>
<guest>
<os_type>xen</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
<emulator>/usr/bin/xenner</emulator>
<machine>xenner</machine>
<domain type='kvm'>
</domain>
<machine maxCpus='4'>ml605</machine>
<domain type='qemu'/>
</arch>
<features>
<pae/>
<nonpae/>
<acpi default='on' toggle='yes'/>
<apic default='on' toggle='no'/>
<disksnapshot default='on' toggle='no'/>
</features>
</guest>
<guest>
<os_type>xen</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
<emulator>/usr/bin/xenner</emulator>
<machine>xenner</machine>
<domain type='kvm'>
</domain>
</arch>
<features>
<acpi default='on' toggle='yes'/>
<apic default='on' toggle='no'/>
</features>
</guest>
</capabilities>

63
tests/capabilities-xml/lxc.xml Normal file
View File

@ -0,0 +1,63 @@
<capabilities>
<!-- Came from Fedora 22 libvirt-daemon-1.2.13-3.fc22.x86_64 -->
<host>
<uuid>39303242-3334-3636-3341-3745ffffffff</uuid>
<cpu>
<arch>x86_64</arch>
</cpu>
<power_management>
<suspend_mem/>
<suspend_disk/>
<suspend_hybrid/>
</power_management>
<topology>
<cells num='1'>
<cell id='0'>
<memory unit='KiB'>16414548</memory>
<pages unit='KiB' size='4'>4103637</pages>
<pages unit='KiB' size='2048'>0</pages>
<distances>
<sibling id='0' value='10'/>
</distances>
<cpus num='8'>
<cpu id='0' socket_id='0' core_id='0' siblings='0-1'/>
<cpu id='1' socket_id='0' core_id='1' siblings='0-1'/>
<cpu id='2' socket_id='0' core_id='6' siblings='2,5'/>
<cpu id='3' socket_id='0' core_id='2' siblings='3-4'/>
<cpu id='4' socket_id='0' core_id='3' siblings='3-4'/>
<cpu id='5' socket_id='0' core_id='7' siblings='2,5'/>
<cpu id='6' socket_id='0' core_id='4' siblings='6-7'/>
<cpu id='7' socket_id='0' core_id='5' siblings='6-7'/>
</cpus>
</cell>
</cells>
</topology>
<secmodel>
<model>selinux</model>
<doi>0</doi>
<baselabel type='lxc'>system_u:system_r:svirt_lxc_net_t:s0</baselabel>
</secmodel>
</host>
<guest>
<os_type>exe</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<domain type='lxc'/>
</arch>
</guest>
<guest>
<os_type>exe</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<domain type='lxc'/>
</arch>
</guest>
</capabilities>

61
tests/capabilities-xml/rhel5.4-kvm-caps.xml
View File

@ -1,61 +0,0 @@
<capabilities>
<host>
<cpu>
<arch>x86_64</arch>
</cpu>
<topology>
<cells num='1'>
<cell id='0'>
<cpus num='2'>
<cpu id='0'/>
<cpu id='1'/>
</cpus>
</cell>
</cells>
</topology>
</host>
<guest>
<os_type>hvm</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
<emulator>/usr/libexec/qemu-kvm</emulator>
<machine>pc</machine>
<machine>isapc</machine>
<domain type='qemu'>
</domain>
<domain type='kvm'>
<emulator>/usr/libexec/qemu-kvm</emulator>
</domain>
</arch>
<features>
<pae/>
<nonpae/>
<acpi default='on' toggle='yes'/>
<apic default='on' toggle='no'/>
</features>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
<emulator>/usr/libexec/qemu-kvm</emulator>
<machine>pc</machine>
<machine>isapc</machine>
<domain type='qemu'>
</domain>
<domain type='kvm'>
<emulator>/usr/libexec/qemu-kvm</emulator>
</domain>
</arch>
<features>
<acpi default='on' toggle='yes'/>
<apic default='on' toggle='no'/>
</features>
</guest>
</capabilities>

55
tests/capabilities-xml/rhel5.4-xen-caps.xml
View File

@ -1,55 +0,0 @@
<capabilities>
<host>
<cpu>
<arch>x86_64</arch>
<features>
<svm/>
</features>
</cpu>
<migration_features>
<live/>
<uri_transports>
<uri_transport>xenmigr</uri_transport>
</uri_transports>
</migration_features>
<topology>
<cells num='1'>
<cell id='0'>
<cpus num='2'>
<cpu id='0'/>
<cpu id='1'/>
</cpus>
</cell>
</cells>
</topology>
</host>
<guest>
<os_type>xen</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
</arch>
</guest>
<guest>
<os_type>xen</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
</arch>
<features>
<pae/>
</features>
</guest>
</capabilities>

0
tests/capabilities-xml/domain-capabilities.xml → tests/capabilities-xml/test-domcaps.xml
View File

26
tests/capabilities-xml/test-old-svm.xml Normal file
View File

@ -0,0 +1,26 @@
<capabilities>
<host>
<cpu>
<arch>x86_64</arch>
<features>
<svm/>
</features>
</cpu>
<migration_features>
<live/>
<uri_transports>
<uri_transport>xenmigr</uri_transport>
</uri_transports>
</migration_features>
<topology>
<cells num='1'>
<cell id='0'>
<cpus num='2'>
<cpu id='0'/>
<cpu id='1'/>
</cpus>
</cell>
</cells>
</topology>
</host>
</capabilities>

28
tests/capabilities-xml/test-old-vmx.xml Normal file
View File

@ -0,0 +1,28 @@
<capabilities>
<host>
<cpu>
<arch>x86_64</arch>
<features>
<vmx/>
</features>
</cpu>
<migration_features>
<live/>
<uri_transports>
<uri_transport>xenmigr</uri_transport>
</uri_transports>
</migration_features>
<topology>
<cells num='1'>
<cell id='0'>
<cpus num='2'>
<cpu id='0'/>
<cpu id='1'/>
</cpus>
</cell>
</cells>
</topology>
</host>
</capabilities>

0
tests/capabilities-xml/libvirt-0.7.6-qemu-no-kvmcaps.xml → tests/capabilities-xml/test-qemu-no-kvm.xml
View File

0
tests/capabilities-xml/libvirt-0.7.6-qemu-caps.xml → tests/capabilities-xml/test-qemu-with-kvm.xml
View File

42
tests/capabilities-xml/xen-ia64-hvm.xml
View File

@ -1,42 +0,0 @@
<capabilities>
<host>
<cpu>
<arch>ia64</arch>
</cpu>
<migration_features>
<live/>
<uri_transports>
<uri_transport>xenmigr</uri_transport>
</uri_transports>
</migration_features>
</host>
<guest>
<os_type>xen</os_type>
<arch name='ia64'>
<wordsize>64</wordsize>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
</arch>
</guest>
<guest>
<os_type>hvm</os_type>
<arch name='ia64'>
<wordsize>64</wordsize>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<loader>/usr/lib/xen/boot/hvmloader</loader>
<machine>xenfv</machine>
<domain type='xen'>
</domain>
</arch>
<features>
<acpi default='on' toggle='yes'/>
<apic default='on' toggle='yes'/>
</features>
</guest>
</capabilities>

0
tests/capabilities-xml/rhel5.4-xen-caps-virt-enabled.xml → tests/capabilities-xml/xen-rhel5.4.xml
View File

165
tests/capabilities.py
View File

@ -33,133 +33,8 @@ class TestCapabilities(unittest.TestCase):
path = os.path.join("tests/capabilities-xml", filename)
return Capabilities(conn, file(path).read())
def _compareGuest(self, (arch, os_type, domains, features), guest):
self.assertEqual(arch, guest.arch)
self.assertEqual(os_type, guest.os_type)
self.assertEqual(len(domains), len(guest.domains))
for n in range(len(domains)):
self.assertEqual(domains[n][0], guest.domains[n].hypervisor_type)
self.assertEqual(domains[n][1], guest.domains[n].emulator)
self.assertEqual(domains[n][2], guest.domains[n].machines)
for n in features:
self.assertEqual(features[n], getattr(guest.features, n))
def _testCapabilities(self, path, (host_arch, host_features), guests,
secmodel=None):
caps = self._buildCaps(path)
if host_arch:
self.assertEqual(host_arch, caps.host.cpu.arch)
for n in host_features:
self.assertEqual(host_features[n], caps.host.cpu.has_feature(n))
if secmodel:
self.assertEqual(secmodel[0], caps.host.secmodels[0].model)
if secmodel[1]:
for idx, (t, v) in enumerate(secmodel[1].items()):
self.assertEqual(t,
caps.host.secmodels[0].baselabels[idx].type)
self.assertEqual(v,
caps.host.secmodels[0].baselabels[idx].content)
for idx in range(len(guests)):
self._compareGuest(guests[idx], caps.guests[idx])
def testCapabilities1(self):
host = ('x86_64', {'vmx': True})
guests = [
('x86_64', 'xen',
[['xen', None, []]], {}),
('i686', 'xen',
[['xen', None, []]], {'pae': True, 'nonpae': False}),
('i686', 'hvm',
[['xen', "/usr/lib64/xen/bin/qemu-dm", ['pc', 'isapc']]],
{'pae': True, 'nonpae': True}),
('x86_64', 'hvm',
[['xen', "/usr/lib64/xen/bin/qemu-dm", ['pc', 'isapc']]], {})
]
self._testCapabilities("capabilities-xen.xml", host, guests)
def testCapabilities2(self):
host = ('x86_64', {})
secmodel = ('selinux', None)
guests = [
('x86_64', 'hvm',
[['qemu', '/usr/bin/qemu-system-x86_64', ['pc', 'isapc']]], {}),
('i686', 'hvm',
[['qemu', '/usr/bin/qemu', ['pc', 'isapc']]], {}),
('mips', 'hvm',
[['qemu', '/usr/bin/qemu-system-mips', ['mips']]], {}),
('mipsel', 'hvm',
[['qemu', '/usr/bin/qemu-system-mipsel', ['mips']]], {}),
('sparc', 'hvm',
[['qemu', '/usr/bin/qemu-system-sparc', ['sun4m']]], {}),
('ppc', 'hvm',
[['qemu', '/usr/bin/qemu-system-ppc',
['g3bw', 'mac99', 'prep']]], {}),
]
self._testCapabilities("capabilities-qemu.xml", host, guests, secmodel)
def testCapabilities3(self):
host = ('i686', {})
guests = [
('i686', 'hvm',
[['qemu', '/usr/bin/qemu', ['pc', 'isapc']],
['kvm', '/usr/bin/qemu-kvm', ['pc', 'isapc']]], {}),
('x86_64', 'hvm',
[['qemu', '/usr/bin/qemu-system-x86_64', ['pc', 'isapc']]], {}),
('mips', 'hvm',
[['qemu', '/usr/bin/qemu-system-mips', ['mips']]], {}),
('mipsel', 'hvm',
[['qemu', '/usr/bin/qemu-system-mipsel', ['mips']]], {}),
('sparc', 'hvm',
[['qemu', '/usr/bin/qemu-system-sparc', ['sun4m']]], {}),
('ppc', 'hvm',
[['qemu', '/usr/bin/qemu-system-ppc',
['g3bw', 'mac99', 'prep']]], {}),
]
secmodel = ('dac', {"kvm" : "+0:+0", "qemu" : "+0:+0"})
self._testCapabilities("capabilities-kvm.xml", host, guests, secmodel)
def testCapabilities4(self):
host = ('i686', {'pae': True, 'nonpae': True})
guests = [
('i686', 'linux',
[['test', None, []]],
{'pae': True, 'nonpae': True}),
]
self._testCapabilities("capabilities-test.xml", host, guests)
def testCapsLXC(self):
guests = [
("x86_64", "exe", [["lxc", "/usr/libexec/libvirt_lxc", []]], {}),
("i686", "exe", [["lxc", "/usr/libexec/libvirt_lxc", []]], {}),
]
self._testCapabilities("capabilities-lxc.xml",
(None, None), guests)
def testCapsTopology(self):
filename = "capabilities-test.xml"
caps = self._buildCaps(filename)
self.assertTrue(bool(caps.host.topology))
self.assertTrue(len(caps.host.topology.cells) == 2)
self.assertTrue(len(caps.host.topology.cells[0].cpus) == 8)
self.assertTrue(len(caps.host.topology.cells[0].cpus) == 8)
def testCapsCPUFeaturesOldSyntax(self):
filename = "rhel5.4-xen-caps-virt-enabled.xml"
filename = "test-old-vmx.xml"
host_feature_list = ["vmx"]
caps = self._buildCaps(filename)
@ -167,7 +42,7 @@ class TestCapabilities(unittest.TestCase):
self.assertEquals(caps.host.cpu.has_feature(f), True)
def testCapsCPUFeaturesOldSyntaxSVM(self):
filename = "rhel5.4-xen-caps.xml"
filename = "test-old-svm.xml"
host_feature_list = ["svm"]
caps = self._buildCaps(filename)
@ -175,7 +50,7 @@ class TestCapabilities(unittest.TestCase):
self.assertEquals(caps.host.cpu.has_feature(f), True)
def testCapsCPUFeaturesNewSyntax(self):
filename = "libvirt-0.7.6-qemu-caps.xml"
filename = "test-qemu-with-kvm.xml"
host_feature_list = ['lahf_lm', 'xtpr', 'cx16', 'tm2', 'est', 'vmx',
'ds_cpl', 'pbe', 'tm', 'ht', 'ss', 'acpi', 'ds']
@ -190,28 +65,25 @@ class TestCapabilities(unittest.TestCase):
self.assertEquals(caps.host.cpu.sockets, 7)
def testCapsUtilFuncs(self):
new_caps = self._buildCaps("libvirt-0.7.6-qemu-caps.xml")
new_caps_no_kvm = self._buildCaps(
"libvirt-0.7.6-qemu-no-kvmcaps.xml")
empty_caps = self._buildCaps("empty-caps.xml")
rhel_xen_enable_hvm_caps = self._buildCaps(
"rhel5.4-xen-caps-virt-enabled.xml")
rhel_xen_caps = self._buildCaps("rhel5.4-xen-caps.xml")
rhel_kvm_caps = self._buildCaps("rhel5.4-kvm-caps.xml")
caps_with_kvm = self._buildCaps("test-qemu-with-kvm.xml")
caps_no_kvm = self._buildCaps("test-qemu-no-kvm.xml")
caps_empty = self._buildCaps("test-old-vmx.xml")
def test_utils(caps, has_guests, is_kvm):
self.assertEquals(caps.has_install_options(), has_guests)
self.assertEquals(caps.is_kvm_available(), is_kvm)
test_utils(new_caps, True, True)
test_utils(empty_caps, False, False)
test_utils(rhel_xen_enable_hvm_caps, True, False)
test_utils(rhel_xen_caps, True, False)
test_utils(rhel_kvm_caps, True, True)
test_utils(new_caps_no_kvm, True, False)
test_utils(caps_empty, False, False)
test_utils(caps_with_kvm, True, True)
test_utils(caps_no_kvm, True, False)
################################################
# Test cpu_map.xml/getCPUModel output handling #
################################################
def _testCPUMap(self, api):
caps = self._buildCaps("libvirt-0.7.6-qemu-caps.xml")
caps = self._buildCaps("test-qemu-with-kvm.xml")
setattr(_CPUMapFileValues, "_cpu_filename",
"tests/capabilities-xml/cpu_map.xml")
@ -247,8 +119,13 @@ class TestCapabilities(unittest.TestCase):
def testCPUMapAPI(self):
self._testCPUMap(api=False)
##############################
# domcapabilities.py testing #
##############################
def testDomainCapabilities(self):
xml = file("tests/capabilities-xml/domain-capabilities.xml").read()
xml = file("tests/capabilities-xml/test-domcaps.xml").read()
caps = DomainCapabilities(utils.open_testdriver(), xml)
self.assertEqual(caps.os.loader.supported, True)

2
tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
View File

@ -14,7 +14,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

4
tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
View File

@ -21,7 +21,7 @@
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/bin/qemu-system-aarch64</emulator>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -64,7 +64,7 @@
<on_reboot>destroy</on_reboot>
<on_crash>preserve</on_crash>
<devices>
<emulator>/bin/qemu-system-aarch64</emulator>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

2
tests/cli-test-xml/compare/virt-install-aarch64-default-uefi.xml
View File

@ -22,7 +22,7 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<emulator>/bin/qemu-system-aarch64</emulator>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
View File

@ -23,7 +23,7 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<emulator>/bin/qemu-system-aarch64</emulator>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

2
tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
View File

@ -23,7 +23,7 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<emulator>/bin/qemu-system-aarch64</emulator>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

2
tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
View File

@ -14,7 +14,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

4
tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -87,7 +87,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

4
tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -87,7 +87,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

4
tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -87,7 +87,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

6
tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -20,7 +20,7 @@
</hyperv>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
@ -90,7 +90,7 @@
</hyperv>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
@ -160,7 +160,7 @@
</hyperv>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>

4
tests/cli-test-xml/compare/virt-install-location-iso.xml
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -79,7 +79,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

4
tests/cli-test-xml/compare/virt-install-q35-defaults.xml
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -88,7 +88,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

6
tests/cli-test-xml/compare/virt-install-win7-uefi.xml
View File

@ -17,7 +17,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
@ -92,7 +92,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
@ -167,7 +167,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>

50
tests/clitest.py
View File

@ -69,20 +69,23 @@ new_files = new_images
clean_files = (new_images + exist_images)
test_files = {
'TESTURI' : utils.testuri,
'DEFAULTURI' : utils.defaulturi,
'REMOTEURI' : utils.uriremote,
'KVMURI' : utils.urikvm,
'REMOTEKVMURI' : utils.urikvm + ",remote",
'KVMURI_NODOMCAPS' : utils.urikvm_nodomcaps,
'XENURI' : utils.urixencaps,
'XENIA64URI' : utils.urixenia64,
'LXCURI' : utils.urilxc,
'URI-TEST': utils.uri_test,
'URI-TEST-DEFAULT': utils.uri_test_default,
'URI-TEST-REMOTE': utils.uri_test_remote,
'URI-KVM': utils.uri_kvm,
'URI-KVM-REMOTE': utils.uri_kvm + ",remote",
'URI-KVM-NODOMCAPS': utils.uri_kvm_nodomcaps,
'URI-XEN': utils.uri_xen,
'URI-LXC': utils.uri_lxc,
'CLONE_DISK_XML' : "%s/clone-disk.xml" % xmldir,
'CLONE_STORAGE_XML' : "%s/clone-disk-managed.xml" % xmldir,
'CLONE_NOEXIST_XML' : "%s/clone-disk-noexist.xml" % xmldir,
'IMAGE_XML' : "%s/image.xml" % xmldir,
'IMAGE_NOGFX_XML' : "%s/image-nogfx.xml" % xmldir,
'OVF_IMG1' : "%s/tests/virtconv-files/ovf_input/test1.ovf" % os.getcwd(),
'VMX_IMG1' : "%s/tests/virtconv-files/vmx_input/test1.vmx" % os.getcwd(),
'NEWIMG1' : "/dev/default-pool/new1.img",
'NEWIMG2' : "/dev/default-pool/new2.img",
'NEWCLONEIMG1' : new_images[0],
@ -102,9 +105,6 @@ test_files = {
'MANAGEDDISKNEW1' : "/dev/disk-pool/newvol1.img",
'COLLIDE' : "/dev/default-pool/collidevol1.img",
'SHARE' : "/dev/default-pool/sharevol.img",
'OVF_IMG1' : "%s/tests/virtconv-files/ovf_input/test1.ovf" % os.getcwd(),
'VMX_IMG1' : "%s/tests/virtconv-files/vmx_input/test1.vmx" % os.getcwd(),
}
@ -289,7 +289,7 @@ class App(object):
args = "--debug"
if "--connect " not in cli:
args += " --connect %(TESTURI)s"
args += " --connect %(URI-TEST)s"
if self.appname in ["virt-install"]:
if "--name " not in cli:
@ -367,7 +367,7 @@ vinst = App("virt-install")
# virt-install verbose XML comparison tests #
#############################################
c = vinst.add_category("xml-comparsion", "--connect %(KVMURI)s --noautoconsole --os-variant fedora20")
c = vinst.add_category("xml-comparsion", "--connect %(URI-KVM)s --noautoconsole --os-variant fedora20")
# Singleton element test #1, for simpler strings
c.add_compare(""" \
@ -528,7 +528,7 @@ c.add_valid("--cpu somemodel") # Simple --cpu
c.add_valid("--security label=foobar.label,relabel=yes") # --security implicit static
c.add_valid("--security label=foobar.label,a1,z2,b3,type=static,relabel=no") # static with commas 1
c.add_valid("--security label=foobar.label,a1,z2,b3") # --security static with commas 2
c.add_compare("--connect %(DEFAULTURI)s --cpuset auto --vcpus 2", "cpuset-auto") # --cpuset=auto actually works
c.add_compare("--connect %(URI-TEST-DEFAULT)s --cpuset auto --vcpus 2", "cpuset-auto") # --cpuset=auto actually works
c.add_invalid("--vcpus 32 --cpuset=969-1000") # Bogus cpuset
c.add_invalid("--vcpus 32 --cpuset=autofoo") # Bogus cpuset
c.add_invalid("--clock foo_tickpolicy=merge") # Unknown timer
@ -597,8 +597,8 @@ c.add_invalid("--serial unix") # Unix with no path
c.add_invalid("--serial null,path=/tmp/foo") # Path where it doesn't belong
c.add_invalid("--channel pty,target_type=guestfwd") # --channel guestfwd without target_address
c.add_invalid("--boot uefi") # URI doesn't support UEFI bits
c.add_invalid("--connect %(KVMURI)s --boot uefi,arch=ppc64") # unsupported arch for UEFI
c.add_valid("--connect %(KVMURI_NODOMCAPS)s --arch aarch64 --nodisks") # attempt to default to aarch64 UEFI, but it fails, but should only print warnings
c.add_invalid("--connect %(URI-KVM)s --boot uefi,arch=ppc64") # unsupported arch for UEFI
c.add_valid("--connect %(URI-KVM-NODOMCAPS)s --arch aarch64 --nodisks") # attempt to default to aarch64 UEFI, but it fails, but should only print warnings
@ -654,7 +654,7 @@ c.add_invalid("--nodisks --pxe --name test") # Colliding name
# Remote URI specific tests #
#############################
c = vinst.add_category("remote", "--connect %(REMOTEURI)s --nographics --noautoconsole")
c = vinst.add_category("remote", "--connect %(URI-TEST-REMOTE)s --nographics --noautoconsole")
c.add_valid("--nodisks --pxe") # Simple pxe nodisks
c.add_valid("--pxe --disk /foo/bar/baz,size=.01") # Creating any random path on the remote host
c.add_valid("--pxe --disk /dev/zde") # /dev file that we just pass through to the remote VM
@ -668,7 +668,7 @@ c.add_invalid("--file /foo/bar/baz --pxe") # Trying to use unmanaged storage wi
# QEMU/KVM specific tests #
###########################
c = vinst.add_category("kvm", "--connect %(KVMURI)s --noautoconsole")
c = vinst.add_category("kvm", "--connect %(URI-KVM)s --noautoconsole")
c.add_compare("--os-variant fedora-unknown --file %(EXISTIMG1)s --location %(TREEDIR)s --extra-args console=ttyS0 --cpu host --channel none --console none --sound none --redirdev none", "kvm-f14-url") # Fedora Directory tree URL install with extra-args
c.add_compare("--test-media-detection %(TREEDIR)s", "test-url-detection") # --test-media-detection
c.add_compare("--os-variant fedora20 --disk %(NEWIMG1)s,size=.01,format=vmdk --location %(TREEDIR)s --extra-args console=ttyS0 --quiet", "quiet-url") # Quiet URL install should make no noise
@ -694,14 +694,14 @@ c.add_invalid("--nodisks --boot network --arch mips --virt-type kvm") # Invalid
c.add_invalid("--nodisks --boot network --paravirt --arch mips") # Invalid arch/virt combo
c.add_compare("--os-variant win7 --cdrom %(EXISTIMG2)s --boot loader_type=pflash,loader=CODE.fd,nvram_template=VARS.fd --disk %(EXISTIMG1)s", "win7-uefi") # no HYPER-V
c.add_compare("--machine q35 --cdrom %(EXISTIMG2)s --disk %(EXISTIMG1)s", "q35-defaults") # proper q35 disk defaults
c.add_compare("--connect %(REMOTEKVMURI)s --import --disk %(EXISTIMG1)s --os-variant fedora21 --pm suspend_to_disk=yes", "f21-kvm-remote")
c.add_compare("--connect %(URI-KVM-REMOTE)s --import --disk %(EXISTIMG1)s --os-variant fedora21 --pm suspend_to_disk=yes", "f21-kvm-remote")
######################
# LXC specific tests #
######################
c = vinst.add_category("lxc", "--connect %(LXCURI)s --noautoconsole --name foolxc --memory 64")
c = vinst.add_category("lxc", "--connect %(URI-LXC)s --noautoconsole --name foolxc --memory 64")
c.add_compare("", "default")
c.add_compare("--filesystem /source,/", "fs-default")
c.add_compare("--init /usr/bin/httpd", "manual-init")
@ -712,7 +712,7 @@ c.add_compare("--init /usr/bin/httpd", "manual-init")
# Xen specific tests #
######################
c = vinst.add_category("xen", "--connect %(XENURI)s --noautoconsole")
c = vinst.add_category("xen", "--connect %(URI-XEN)s --noautoconsole")
c.add_compare("--disk %(EXISTIMG1)s --import", "xen-default") # Xen default
c.add_compare("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt", "xen-pv") # Xen PV
c.add_compare("--disk %(EXISTIMG1)s --cdrom %(EXISTIMG1)s --livecd --hvm", "xen-hvm") # Xen HVM
@ -849,14 +849,14 @@ c.add_compare("--remove-device --host-device 0x04b3:0x4485", "remove-hostdev-nam
####################
vclon = App("virt-clone")
c = vclon.add_category("remote", "--connect %(REMOTEURI)s")
c = vclon.add_category("remote", "--connect %(URI-TEST-REMOTE)s")
c.add_valid("-o test --auto-clone") # Auto flag, no storage
c.add_valid("--original-xml %(CLONE_STORAGE_XML)s --auto-clone") # Auto flag w/ managed storage
c.add_invalid("--original-xml %(CLONE_DISK_XML)s --auto-clone") # Auto flag w/ local storage, which is invalid for remote connection
c = vclon.add_category("misc", "")
c.add_compare("--connect %(KVMURI)s -o test-for-clone --auto-clone --clone-running", "clone-auto1", compare_check=support.SUPPORT_CONN_LOADER_ROM)
c.add_compare("--connect %(URI-KVM)s -o test-for-clone --auto-clone --clone-running", "clone-auto1", compare_check=support.SUPPORT_CONN_LOADER_ROM)
c.add_compare("-o test-clone-simple --name newvm --auto-clone --clone-running", "clone-auto2", compare_check=support.SUPPORT_CONN_LOADER_ROM)
c.add_valid("-o test --auto-clone") # Auto flag, no storage
c.add_valid("--original-xml %(CLONE_STORAGE_XML)s --auto-clone") # Auto flag w/ managed storage
@ -898,7 +898,7 @@ c.add_invalid("--original-xml %(CLONE_NOEXIST_XML)s --file %(EXISTIMG1)s") # XM
######################
vconv = App("virt-convert")
c = vconv.add_category("misc", "--connect %(KVMURI)s --dry")
c = vconv.add_category("misc", "--connect %(URI-KVM)s --dry")
c.add_invalid("%(VMX_IMG1)s --input-format foo") # invalid input format
c.add_invalid("%(EXISTIMG1)s") # invalid input file

42
tests/utils.py
View File

@ -32,18 +32,18 @@ REGENERATE_OUTPUT = False
_capsprefix = ",caps=%s/tests/capabilities-xml/" % os.getcwd()
_domcapsprefix = ",domcaps=%s/tests/capabilities-xml/" % os.getcwd()
defaulturi = "__virtinst_test__test:///default,predictable"
testuri = "__virtinst_test__test:///%s/tests/testdriver.xml,predictable" % os.getcwd()
uriremote = testuri + ",remote"
uriqemu = "%s,qemu" % testuri
urixen = "%s,xen" % testuri
urixencaps = testuri + _capsprefix + "rhel5.4-xen-caps-virt-enabled.xml,xen"
urixenia64 = testuri + _capsprefix + "xen-ia64-hvm.xml,xen"
urirhelkvm = (uriqemu + _capsprefix + "caps-libvirt-1.1.1-29.el7.xml")
urikvm_nodomcaps = (uriqemu + _capsprefix + "libvirt-1.1.2-qemu-caps.xml")
urikvm = (urikvm_nodomcaps +
_domcapsprefix + "domcapabilities-1.2.12-aavmf.xml")
urilxc = testuri + _capsprefix + "capabilities-lxc.xml,lxc"
uri_test_default = "__virtinst_test__test:///default,predictable"
uri_test = "__virtinst_test__test:///%s/tests/testdriver.xml,predictable" % os.getcwd()
uri_test_remote = uri_test + ",remote"
_uri_qemu = "%s,qemu" % uri_test
uri_kvm_rhel = (_uri_qemu + _capsprefix + "kvm-x86_64-rhel7.xml")
uri_kvm_nodomcaps = (_uri_qemu + _capsprefix + "kvm-x86_64.xml")
uri_kvm = (uri_kvm_nodomcaps + _domcapsprefix + "kvm-x86_64-domcaps.xml")
uri_xen = uri_test + _capsprefix + "xen-rhel5.4.xml,xen"
uri_lxc = uri_test + _capsprefix + "lxc.xml,lxc"
def get_debug():
@ -113,27 +113,23 @@ def openconn(uri):
def open_testdefault():
return openconn("test:///default")
return openconn(uri_test_default)
def open_testdriver():
return openconn(testuri)
return openconn(uri_test)
def open_testkvmdriver():
return openconn(urikvm)
def open_kvm(connver=None, libver=None):
return openconn(_make_uri(uri_kvm, connver, libver))
def open_plainkvm(connver=None, libver=None):
return openconn(_make_uri(uriqemu, connver, libver))
def open_rhelkvm(connver=None):
return openconn(_make_uri(urirhelkvm, connver))
def open_kvm_rhel(connver=None):
return openconn(_make_uri(uri_kvm_rhel, connver))
def open_test_remote():
return openconn(uriremote)
return openconn(uri_test_remote)
def _libvirt_callback(ignore, err):

2
tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
View File

@ -14,7 +14,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
View File

@ -14,7 +14,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
View File

@ -14,7 +14,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
View File

@ -14,7 +14,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
View File

@ -15,7 +15,7 @@
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<model>Opteron_G4</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

2
tests/virtconvtest.py
View File

@ -27,7 +27,7 @@ from tests import utils
base_dir = os.getcwd() + "/tests/virtconv-files/"
out_dir = base_dir + "libvirt_output"
conn = utils.open_testkvmdriver()
conn = utils.open_kvm()
class TestVirtConv(unittest.TestCase):

11
tests/xmlconfig.py
View File

@ -275,10 +275,9 @@ class TestXMLMisc(unittest.TestCase):
xml, ignore = g.start_install(return_xml=True, dry=True)
return "ac97" in xml
self.assertTrue(has_ac97(utils.open_plainkvm(connver=11000)))
self.assertFalse(has_ac97(utils.open_plainkvm(libver=5000)))
self.assertFalse(has_ac97(
utils.open_plainkvm(libver=7000, connver=7000)))
self.assertTrue(has_ac97(utils.open_kvm(connver=11000)))
self.assertFalse(has_ac97(utils.open_kvm(libver=5000)))
self.assertFalse(has_ac97(utils.open_kvm(libver=7000, connver=7000)))
def testOSDeviceDefaultChange(self):
"""
@ -286,7 +285,7 @@ class TestXMLMisc(unittest.TestCase):
distro/variant mid process
"""
# Use connver=12005 so that non-rhel displays ac97
conn = utils.open_rhelkvm(connver=12005)
conn = utils.open_kvm_rhel(connver=12005)
g = _make_guest(conn=conn)
g.os_variant = "fedora11"
@ -310,7 +309,7 @@ class TestXMLMisc(unittest.TestCase):
def test_no_vmvga_RHEL(self):
# Test that vmvga is not used on RHEL
conn = utils.open_rhelkvm()
conn = utils.open_kvm_rhel()
def _make():
g = _make_guest(conn=conn)
g.emulator = "/usr/libexec/qemu-kvm"

2
tests/xmlparse.py
View File

@ -24,7 +24,7 @@ import virtinst
from tests import utils
conn = utils.open_testdriver()
kvmconn = utils.open_testkvmdriver()
kvmconn = utils.open_kvm()
def sanitize_file_xml(xml):

8
virtinst/capabilities.py
View File

@ -120,8 +120,6 @@ class _CapsCPU(DomainCPU):
# capabilities used to just expose these properties as bools
_svm_bool = XMLProperty("./features/svm", is_bool=True)
_vmx_bool = XMLProperty("./features/vmx", is_bool=True)
_pae_bool = XMLProperty("./features/pae", is_bool=True)
_nonpae_bool = XMLProperty("./features/nonpae", is_bool=True)
##############
@ -133,11 +131,6 @@ class _CapsCPU(DomainCPU):
return True
if name == "vmx" and self._vmx_bool:
return True
if name == "pae" and self._pae_bool:
return True
if name == "nonpae" and self._nonpae_bool:
return True
return name in [f.name for f in self.features]
@ -213,7 +206,6 @@ class _CapsGuestFeatures(XMLBuilder):
_XML_ROOT_NAME = "features"
pae = XMLProperty("./pae", is_bool=True)
nonpae = XMLProperty("./nonpae", is_bool=True)
class _CapsGuest(XMLBuilder):