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

tests: update x86 capabilities data 

Using qemu 6.1.0 and libvirt 7.6.0 on Fedora 35

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2022-01-24 13:53:23 -05:00
parent b39aa1ea79
commit 11365e6f43
47 changed files with 841 additions and 698 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
tests/data/capabilities/kvm-x86_64-domcaps.xml
View File

@ -1,15 +1,17 @@
<domainCapabilities>
<path>/bin/qemu-system-x86_64</path>
<path>/usr/bin/qemu-system-x86_64</path>
<domain>kvm</domain>
<machine>pc-i440fx-2.1</machine>
<machine>pc-i440fx-6.1</machine>
<arch>x86_64</arch>
<vcpu max='255'/>
<iothreads supported='yes'/>
<os supported='yes'>
<enum name='firmware'>
<value>efi</value>
</enum>
<loader supported='yes'>
<value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
<value>/usr/share/OVMF/OVMF_CODE.fd</value>
<value>/usr/share/edk2/ovmf/OVMF_CODE.fd</value>
<value>/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd</value>
<value>/usr/share/edk2/arm/QEMU_EFI-pflash.raw</value>
<enum name='type'>
<value>rom</value>
<value>pflash</value>
@ -18,24 +20,49 @@
<value>yes</value>
<value>no</value>
</enum>
<enum name='secure'>
<value>no</value>
</enum>
</loader>
</os>
<cpu>
<mode name='host-passthrough' supported='yes'/>
<mode name='host-passthrough' supported='yes'>
<enum name='hostPassthroughMigratable'>
<value>on</value>
<value>off</value>
</enum>
</mode>
<mode name='maximum' supported='yes'>
<enum name='maximumMigratable'>
<value>on</value>
<value>off</value>
</enum>
</mode>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Broadwell</model>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='md-clear'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='ibpb'/>
<feature policy='require' name='ibrs'/>
<feature policy='require' name='amd-stibp'/>
<feature policy='require' name='amd-ssbd'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='pschange-mc-no'/>
<feature policy='disable' name='hle'/>
<feature policy='disable' name='rtm'/>
</mode>
<mode name='custom' supported='yes'>
<model usable='yes'>qemu64</model>
@ -50,38 +77,58 @@
<model usable='yes'>coreduo</model>
<model usable='yes'>core2duo</model>
<model usable='no'>athlon</model>
<model usable='yes'>Westmere-IBRS</model>
<model usable='yes'>Westmere</model>
<model usable='no'>Westmere-IBRS</model>
<model usable='no'>Skylake-Server</model>
<model usable='no'>Snowridge</model>
<model usable='no'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'>Skylake-Server-IBRS</model>
<model usable='no'>Skylake-Client</model>
<model usable='no'>Skylake-Server</model>
<model usable='yes'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'>Skylake-Client-IBRS</model>
<model usable='no'>Skylake-Client</model>
<model usable='yes'>SandyBridge-IBRS</model>
<model usable='yes'>SandyBridge</model>
<model usable='no'>SandyBridge-IBRS</model>
<model usable='yes'>Penryn</model>
<model usable='no'>Opteron_G5</model>
<model usable='yes'>Opteron_G4</model>
<model usable='no'>Opteron_G4</model>
<model usable='no'>Opteron_G3</model>
<model usable='yes'>Opteron_G2</model>
<model usable='yes'>Opteron_G1</model>
<model usable='yes'>Nehalem-IBRS</model>
<model usable='yes'>Nehalem</model>
<model usable='no'>Nehalem-IBRS</model>
<model usable='yes'>IvyBridge-IBRS</model>
<model usable='yes'>IvyBridge</model>
<model usable='no'>IvyBridge-IBRS</model>
<model usable='yes'>Haswell</model>
<model usable='no'>Icelake-Server-noTSX</model>
<model usable='no'>Icelake-Server</model>
<model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
<model usable='no' deprecated='yes'>Icelake-Client</model>
<model usable='yes'>Haswell-noTSX-IBRS</model>
<model usable='yes'>Haswell-noTSX</model>
<model usable='no'>Haswell-noTSX-IBRS</model>
<model usable='no'>Haswell-IBRS</model>
<model usable='no'>EPYC</model>
<model usable='no'>Haswell</model>
<model usable='no'>EPYC-Rome</model>
<model usable='no'>EPYC-Milan</model>
<model usable='no'>EPYC-IBPB</model>
<model usable='no'>EPYC</model>
<model usable='no'>Dhyana</model>
<model usable='no'>Cooperlake</model>
<model usable='yes'>Conroe</model>
<model usable='yes'>Broadwell</model>
<model usable='no'>Cascadelake-Server-noTSX</model>
<model usable='no'>Cascadelake-Server</model>
<model usable='yes'>Broadwell-noTSX-IBRS</model>
<model usable='yes'>Broadwell-noTSX</model>
<model usable='no'>Broadwell-noTSX-IBRS</model>
<model usable='no'>Broadwell-IBRS</model>
<model usable='no'>Broadwell</model>
<model usable='yes'>486</model>
</mode>
</cpu>
<memoryBacking supported='yes'>
<enum name='sourceType'>
<value>file</value>
<value>anonymous</value>
<value>memfd</value>
</enum>
</memoryBacking>
<devices>
<disk supported='yes'>
<enum name='diskDevice'>
@ -98,12 +145,18 @@
<value>usb</value>
<value>sata</value>
</enum>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
</disk>
<graphics supported='yes'>
<enum name='type'>
<value>sdl</value>
<value>vnc</value>
<value>spice</value>
<value>egl-headless</value>
</enum>
</graphics>
<video supported='yes'>
@ -113,7 +166,9 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
</video>
<hostdev supported='yes'>
@ -132,10 +187,39 @@
<value>scsi</value>
</enum>
<enum name='capsType'/>
<enum name='pciBackend'/>
<enum name='pciBackend'>
<value>default</value>
<value>vfio</value>
</enum>
</hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
<value>builtin</value>
</enum>
</rng>
<filesystem supported='yes'>
<enum name='driverType'>
<value>path</value>
<value>handle</value>
<value>virtiofs</value>
</enum>
</filesystem>
</devices>
<features>
<gic supported='no'/>
<vmcoreinfo supported='yes'/>
<genid supported='yes'/>
<backingStoreInput supported='yes'/>
<backup supported='yes'/>
<sev supported='no'/>
</features>
</domainCapabilities>

1062
tests/data/capabilities/kvm-x86_64.xml
View File

File diff suppressed because it is too large Load Diff

6
tests/data/cli/compare/virt-install-aarch64-cdrom.xml
View File

@ -11,6 +11,9 @@
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
<features>
<acpi/>
</features>
<clock offset="utc"/>
<on_poweroff>restart</on_poweroff>
<on_reboot>destroy</on_reboot>
@ -66,6 +69,9 @@
<nvram template="VARS.fd"/>
<boot dev="hd"/>
</os>
<features>
<acpi/>
</features>
<clock offset="utc"/>
<on_poweroff>restart</on_poweroff>
<on_reboot>destroy</on_reboot>

3
tests/data/cli/compare/virt-install-aarch64-machdefault.xml
View File

@ -10,6 +10,9 @@
<initrd>/f19-arm.initrd</initrd>
<cmdline>console=ttyAMA0,1234 rw root=/dev/vda3</cmdline>
</os>
<features>
<acpi/>
</features>
<cpu mode="custom" match="exact">
<model>cortex-a57</model>
</cpu>

3
tests/data/cli/compare/virt-install-aarch64-machvirt.xml
View File

@ -10,6 +10,9 @@
<initrd>/f19-arm.initrd</initrd>
<cmdline>console=ttyAMA0,1234 rw root=/dev/vda3</cmdline>
</os>
<features>
<acpi/>
</features>
<cpu mode="custom" match="exact">
<model>cortex-a57</model>
</cpu>

2
tests/data/cli/compare/virt-install-boot-uefi-notpm.xml
View File

@ -26,7 +26,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/var/lib/libvirt/images/disk.qcow2"/>

2
tests/data/cli/compare/virt-install-boot-uefi.xml
View File

@ -26,7 +26,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>

8
tests/data/cli/compare/virt-install-cdrom-centos-label.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -90,7 +90,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -109,7 +109,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

8
tests/data/cli/compare/virt-install-cpu-disable-sec.xml
View File

@ -5,7 +5,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="network"/>
</os>
<features>
@ -26,7 +26,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
@ -52,7 +52,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="network"/>
</os>
<features>
@ -72,7 +72,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>

4
tests/data/cli/compare/virt-install-f21-kvm-remote.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -29,7 +29,7 @@
<suspend-to-mem enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

2
tests/data/cli/compare/virt-install-graphics-usb-disable.xml
View File

@ -29,7 +29,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/var/lib/libvirt/images/fedora26.qcow2"/>

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

@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -98,7 +98,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

12
tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="network"/>
<boot dev="hd"/>
</os>
@ -20,7 +20,7 @@
<vmport state="off"/>
</features>
<cpu mode="custom" match="exact">
<model>Opteron_G4</model>
<model>Skylake-Client-noTSX-IBRS</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -33,7 +33,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -80,7 +80,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -89,7 +89,7 @@
<vmport state="off"/>
</features>
<cpu mode="custom" match="exact">
<model>Opteron_G4</model>
<model>Skylake-Client-noTSX-IBRS</model>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -101,7 +101,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

4
tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml
View File

@ -32,7 +32,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -89,7 +89,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

100
tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml
View File

@ -5,7 +5,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="network"/>
</os>
<features>
@ -14,27 +14,33 @@
<vmport state="off"/>
</features>
<cpu mode="custom" match="exact">
<model>Opteron_G4</model>
<vendor>AMD</vendor>
<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"/>
<model>Skylake-Client-noTSX-IBRS</model>
<vendor>Intel</vendor>
<feature name="ds"/>
<feature name="acpi"/>
<feature name="ss"/>
<feature name="ht"/>
<feature name="vme"/>
<feature name="tm"/>
<feature name="pbe"/>
<feature name="dtes64"/>
<feature name="monitor"/>
<feature name="ds_cpl"/>
<feature name="vmx"/>
<feature name="smx"/>
<feature name="est"/>
<feature name="tm2"/>
<feature name="xtpr"/>
<feature name="pdcm"/>
<feature name="osxsave"/>
<feature name="tsc_adjust"/>
<feature name="clflushopt"/>
<feature name="intel-pt"/>
<feature name="md-clear"/>
<feature name="stibp"/>
<feature name="ssbd"/>
<feature name="xsaves"/>
<feature name="pdpe1gb"/>
<feature name="invtsc"/>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -47,7 +53,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
@ -86,7 +92,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="network"/>
</os>
<features>
@ -95,27 +101,33 @@
<vmport state="off"/>
</features>
<cpu mode="custom" match="exact">
<model>Opteron_G4</model>
<vendor>AMD</vendor>
<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"/>
<model>Skylake-Client-noTSX-IBRS</model>
<vendor>Intel</vendor>
<feature name="ds"/>
<feature name="acpi"/>
<feature name="ss"/>
<feature name="ht"/>
<feature name="vme"/>
<feature name="tm"/>
<feature name="pbe"/>
<feature name="dtes64"/>
<feature name="monitor"/>
<feature name="ds_cpl"/>
<feature name="vmx"/>
<feature name="smx"/>
<feature name="est"/>
<feature name="tm2"/>
<feature name="xtpr"/>
<feature name="pdcm"/>
<feature name="osxsave"/>
<feature name="tsc_adjust"/>
<feature name="clflushopt"/>
<feature name="intel-pt"/>
<feature name="md-clear"/>
<feature name="stibp"/>
<feature name="ssbd"/>
<feature name="xsaves"/>
<feature name="pdpe1gb"/>
<feature name="invtsc"/>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@ -127,7 +139,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>

8
tests/data/cli/compare/virt-install-kvm-i686-uefi.xml
View File

@ -5,7 +5,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="i686" machine="pc">hvm</type>
<type arch="i686" machine="pc-i440fx-6.1">hvm</type>
<loader readonly="yes" type="pflash">/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd</loader>
<kernel>/VIRTINST-TESTSUITE/httpkernel</kernel>
<initrd>/VIRTINST-TESTSUITE/ftpinitrd</initrd>
@ -27,7 +27,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-i386</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
@ -66,7 +66,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="i686" machine="pc">hvm</type>
<type arch="i686" machine="pc-i440fx-6.1">hvm</type>
<loader readonly="yes" type="pflash">/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd</loader>
<boot dev="hd"/>
</os>
@ -86,7 +86,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-i386</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>

8
tests/data/cli/compare/virt-install-kvm-rhel5.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="network"/>
<boot dev="hd"/>
</os>
@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -79,7 +79,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -98,7 +98,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

8
tests/data/cli/compare/virt-install-kvm-rhel6.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<kernel>/VIRTINST-TESTSUITE/fake-win7.iso</kernel>
<initrd>/VIRTINST-TESTSUITE/fake-centos65-label.iso</initrd>
<cmdline>foo bar</cmdline>
@ -32,7 +32,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -85,7 +85,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -104,7 +104,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

8
tests/data/cli/compare/virt-install-kvm-rhel7.xml
View File

@ -10,7 +10,7 @@
<currentMemory>1572864</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
<initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
<cmdline>test overwrite</cmdline>
@ -32,7 +32,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -79,7 +79,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -98,7 +98,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

8
tests/data/cli/compare/virt-install-kvm-session-defaults.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/tmp/.local/share/libvirt/images/disk.qcow2"/>
@ -84,7 +84,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -103,7 +103,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/tmp/.local/share/libvirt/images/disk.qcow2"/>

4
tests/data/cli/compare/virt-install-kvm-win10.xml
View File

@ -37,7 +37,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -108,7 +108,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

8
tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="cdrom"/>
<boot dev="hd"/>
</os>
@ -37,7 +37,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -83,7 +83,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -108,7 +108,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

8
tests/data/cli/compare/virt-install-location-iso.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
<initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
</os>
@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -89,7 +89,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -108,7 +108,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

8
tests/data/cli/compare/virt-install-location-manual-kernel.xml
View File

@ -5,7 +5,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<kernel>/VIRTINST-TESTSUITE/frib.img</kernel>
<initrd>/VIRTINST-TESTSUITE/frob.img</initrd>
</os>
@ -26,7 +26,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="tests/data/fakemedia/fake-no-osinfo.iso"/>
@ -71,7 +71,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="cdrom"/>
</os>
<features>
@ -90,7 +90,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="cdrom">
<target dev="hda" bus="ide"/>
<readonly/>

2
tests/data/cli/compare/virt-install-many-devices.xml
View File

@ -37,7 +37,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="block" device="disk">
<driver name="qemu" type="raw" cache="writeback" io="threads" iothread="3" queues="8"/>
<source dev="/dev/default-pool/UPPER"/>

4
tests/data/cli/compare/virt-install-network-install-resources.xml
View File

@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
@ -79,7 +79,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>

4
tests/data/cli/compare/virt-install-openbsd-defaults.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -29,7 +29,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/var/lib/libvirt/images/disk.qcow2"/>

4
tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml
View File

@ -30,7 +30,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -83,7 +83,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

4
tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml
View File

@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="tests/data/fakemedia/fake-f26-netinst.iso"/>
@ -85,7 +85,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="cdrom">
<target dev="sda" bus="sata"/>
<readonly/>

8
tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
<initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
<cmdline>ks=file:/fedora.ks method=http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</cmdline>
@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
@ -70,7 +70,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<boot dev="hd"/>
</os>
<features>
@ -88,7 +88,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>

4
tests/data/cli/compare/virt-install-osinfo-url-unattended.xml
View File

@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
@ -79,7 +79,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>

4
tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
View File

@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -89,7 +89,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

4
tests/data/cli/compare/virt-install-osinfo-url.xml
View File

@ -31,7 +31,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
@ -79,7 +79,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>

4
tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml
View File

@ -35,7 +35,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="tests/data/fakemedia/fake-win7.iso"/>
@ -110,7 +110,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="cdrom">
<driver name="qemu"/>
<source file="tests/data/fakemedia/fake-win7.iso"/>

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

@ -26,7 +26,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -95,7 +95,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

4
tests/data/cli/compare/virt-install-qemu-32-on-64.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="i686" machine="pc">hvm</type>
<type arch="i686" machine="pc-i440fx-6.1">hvm</type>
<boot dev="network"/>
</os>
<features>
@ -29,7 +29,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-i386</emulator>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>

8
tests/data/cli/compare/virt-install-qemu-plain.xml
View File

@ -10,8 +10,8 @@
<currentMemory>65536</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch="x86_64" machine="pc">hvm</type>
<loader readonly="yes" type="pflash">/usr/share/OVMF/OVMF_CODE.fd</loader>
<type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
<loader readonly="yes" type="pflash">/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
<boot dev="cdrom"/>
</os>
<features>
@ -20,6 +20,10 @@
</features>
<cpu mode="custom" match="exact">
<model>Penryn</model>
<feature policy="require" name="ibpb"/>
<feature policy="require" name="md-clear"/>
<feature policy="require" name="spec-ctrl"/>
<feature policy="require" name="ssbd"/>
</cpu>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>

29
tests/data/cli/compare/virt-install-singleton-config-1.xml
View File

@ -23,7 +23,7 @@
</resource>
<os>
<type arch="x86_64" machine="q35">hvm</type>
<loader readonly="yes" type="pflash">/usr/share/OVMF/OVMF_CODE.fd</loader>
<loader readonly="yes" type="pflash">/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
<initarg>foo</initarg>
<initarg>bar=baz</initarg>
<boot dev="network"/>
@ -35,20 +35,31 @@
<vmport state="off"/>
</features>
<cpu mode="custom" match="exact">
<model fallback="forbid">Broadwell</model>
<model fallback="forbid">Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<topology sockets="2" dies="1" cores="2" threads="1"/>
<feature policy="require" name="vme"/>
<feature policy="require" name="ss"/>
<feature policy="require" name="f16c"/>
<feature policy="require" name="rdrand"/>
<feature policy="require" name="vmx"/>
<feature policy="require" name="pdcm"/>
<feature policy="require" name="hypervisor"/>
<feature policy="require" name="arat"/>
<feature policy="require" name="tsc_adjust"/>
<feature policy="require" name="xsaveopt"/>
<feature policy="require" name="clflushopt"/>
<feature policy="require" name="umip"/>
<feature policy="require" name="md-clear"/>
<feature policy="require" name="stibp"/>
<feature policy="require" name="arch-capabilities"/>
<feature policy="require" name="ssbd"/>
<feature policy="require" name="xsaves"/>
<feature policy="require" name="pdpe1gb"/>
<feature policy="require" name="abm"/>
<feature policy="require" name="invtsc"/>
<feature policy="require" name="ibpb"/>
<feature policy="require" name="ibrs"/>
<feature policy="require" name="amd-stibp"/>
<feature policy="require" name="amd-ssbd"/>
<feature policy="require" name="skip-l1dfl-vmentry"/>
<feature policy="require" name="pschange-mc-no"/>
<feature policy="disable" name="hle"/>
<feature policy="disable" name="rtm"/>
</cpu>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
@ -61,7 +72,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>

8
tests/data/cli/compare/virt-install-singleton-config-2.xml
View File

@ -132,6 +132,10 @@
<model>foobar</model>
<vendor>meee</vendor>
<cache level="3" mode="emulate"/>
<feature policy="require" name="ibpb"/>
<feature policy="require" name="md-clear"/>
<feature policy="require" name="spec-ctrl"/>
<feature policy="require" name="ssbd"/>
<feature policy="force" name="x2apic"/>
<feature policy="force" name="x2apicagain"/>
<feature policy="require" name="reqtest"/>
@ -416,6 +420,10 @@
<model>foobar</model>
<vendor>meee</vendor>
<cache level="3" mode="emulate"/>
<feature policy="require" name="ibpb"/>
<feature policy="require" name="md-clear"/>
<feature policy="require" name="spec-ctrl"/>
<feature policy="require" name="ssbd"/>
<feature policy="force" name="x2apic"/>
<feature policy="force" name="x2apicagain"/>
<feature policy="require" name="reqtest"/>

2
tests/data/cli/compare/virt-install-singleton-config-3.xml
View File

@ -94,7 +94,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>

4
tests/data/cli/compare/virt-install-win7-uefi.xml
View File

@ -33,7 +33,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
@ -109,7 +109,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

2
tests/data/cli/compare/virt-install-x86_64-graphics.xml
View File

@ -28,7 +28,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

2
tests/data/cli/compare/virt-install-x86_64-headless.xml
View File

@ -28,7 +28,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>

2
tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml
View File

@ -25,7 +25,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>

2
tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml
View File

@ -25,7 +25,7 @@
<suspend-to-disk enabled="no"/>
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>

4
tests/test_capabilities.py
View File

@ -87,10 +87,10 @@ def testDomainCapabilitiesx86():
xml = open(DATADIR + "/kvm-x86_64-domcaps.xml").read()
caps = DomainCapabilities(utils.URIs.open_testdriver_cached(), xml)
assert caps.machine == "pc-i440fx-2.1"
assert caps.machine == "pc-i440fx-6.1"
assert caps.arch == "x86_64"
assert caps.domain == "kvm"
assert caps.path == "/bin/qemu-system-x86_64"
assert caps.path == "/usr/bin/qemu-system-x86_64"
custom_mode = caps.cpu.get_mode("custom")
assert bool(custom_mode)

2
tests/test_misc.py
View File

@ -148,7 +148,7 @@ def test_misc_cpu_cornercases():
guest = virtinst.Guest(kvmconn)
guest.x86_cpu_default = guest.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
guest.set_defaults(guest)
assert guest.cpu.model == "Opteron_G4"
assert guest.cpu.model == "Skylake-Client-noTSX-IBRS"
# pylint: disable=protected-access
guest.cpu.model = "idontexist"