mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-12-22 13:34:07 +03:00
tests: Remove unnecessary KVMIBM data
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
parent
adae7bf1e5
commit
5444bf32f5
@ -1,82 +0,0 @@
|
||||
<capabilities>
|
||||
<!-- The xml comes from the Distro KVMIBM for s390x -->
|
||||
|
||||
<host>
|
||||
<uuid>b53b15d6-348a-4620-afd3-81278b81fbd7</uuid>
|
||||
<cpu>
|
||||
<arch>s390x</arch>
|
||||
<model>host</model>
|
||||
<topology sockets="1" cores="4" threads="1"/>
|
||||
<pages unit="KiB" size="4"/>
|
||||
<pages unit="KiB" size="1024"/>
|
||||
</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">3911020</memory>
|
||||
<cpus num="4">
|
||||
<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="0" core_id="2" siblings="2"/>
|
||||
<cpu id="3" socket_id="0" core_id="3" siblings="3"/>
|
||||
</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">+0:+0</baselabel>
|
||||
<baselabel type="qemu">+0:+0</baselabel>
|
||||
</secmodel>
|
||||
</host>
|
||||
|
||||
<guest>
|
||||
<os_type>hvm</os_type>
|
||||
<arch name="s390x">
|
||||
<wordsize>64</wordsize>
|
||||
<emulator>/usr/bin/qemu-system-s390x</emulator>
|
||||
<machine maxCpus="64">s390-ccw-kvmibm-1.1.1</machine>
|
||||
<machine canonical="s390-ccw-kvmibm-1.1.1" maxCpus="64">s390-ccw-virtio</machine>
|
||||
<machine maxCpus="64">s390-ccw-kvmibm-1.1.0</machine>
|
||||
<machine maxCpus="255">s390-virtio</machine>
|
||||
<machine canonical="s390-virtio" maxCpus="255">s390</machine>
|
||||
<machine maxCpus="255">s390-ccw-virtio-2.4</machine>
|
||||
<domain type="qemu">
|
||||
<emulator>/usr/bin/qemu-system-s390x</emulator>
|
||||
</domain>
|
||||
<domain type="kvm">
|
||||
<emulator>/usr/bin/qemu-kvm</emulator>
|
||||
<machine maxCpus="64">s390-ccw-kvmibm-1.1.1</machine>
|
||||
<machine canonical="s390-ccw-kvmibm-1.1.1" maxCpus="64">s390-ccw-virtio</machine>
|
||||
<machine maxCpus="64">s390-ccw-kvmibm-1.1.0</machine>
|
||||
<machine maxCpus="255">s390-virtio</machine>
|
||||
<machine canonical="s390-virtio" maxCpus="255">s390</machine>
|
||||
<machine maxCpus="255">s390-ccw-virtio-2.4</machine>
|
||||
</domain>
|
||||
</arch>
|
||||
<features>
|
||||
<cpuselection/>
|
||||
<deviceboot/>
|
||||
<disksnapshot default="on" toggle="no"/>
|
||||
</features>
|
||||
</guest>
|
||||
|
||||
</capabilities>
|
||||
@ -1,55 +0,0 @@
|
||||
<domain type="kvm">
|
||||
<name>fedora21</name>
|
||||
<uuid>00000000-1111-2222-3333-444444444444</uuid>
|
||||
<metadata>
|
||||
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
|
||||
<libosinfo:os id="http://fedoraproject.org/fedora/21"/>
|
||||
</libosinfo:libosinfo>
|
||||
</metadata>
|
||||
<memory>65536</memory>
|
||||
<currentMemory>65536</currentMemory>
|
||||
<vcpu>2</vcpu>
|
||||
<os>
|
||||
<type arch="s390x" machine="s390-ccw-virtio">hvm</type>
|
||||
<kernel>/kernel.img</kernel>
|
||||
<initrd>/initrd.img</initrd>
|
||||
</os>
|
||||
<clock offset="utc"/>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-kvm</emulator>
|
||||
<disk type="file" device="disk">
|
||||
<driver name="qemu" type="qcow2"/>
|
||||
<source file="/dev/default-pool/testvol1.img"/>
|
||||
<target dev="vda" bus="virtio"/>
|
||||
</disk>
|
||||
<disk type="file" device="cdrom">
|
||||
<driver name="qemu"/>
|
||||
<source file="/tmp/__virtinst_cli_exist1.img"/>
|
||||
<target dev="sda" bus="scsi"/>
|
||||
<readonly/>
|
||||
</disk>
|
||||
<controller type="scsi" model="virtio-scsi"/>
|
||||
<interface type="bridge">
|
||||
<source bridge="testsuitebr0"/>
|
||||
<mac address="00:11:22:33:44:55"/>
|
||||
<model type="virtio"/>
|
||||
</interface>
|
||||
<console type="pty">
|
||||
<target type="sclp"/>
|
||||
</console>
|
||||
<channel type="unix">
|
||||
<source mode="bind"/>
|
||||
<target type="virtio" name="org.qemu.guest_agent.0"/>
|
||||
</channel>
|
||||
<graphics type="vnc" port="-1"/>
|
||||
<video>
|
||||
<model type="virtio"/>
|
||||
</video>
|
||||
<watchdog model="diag288" action="reset"/>
|
||||
<memballoon model="virtio"/>
|
||||
<rng model="virtio">
|
||||
<backend model="random">/dev/urandom</backend>
|
||||
</rng>
|
||||
<panic model="s390"/>
|
||||
</devices>
|
||||
</domain>
|
||||
@ -45,5 +45,6 @@
|
||||
<rng model="virtio">
|
||||
<backend model="random">/dev/urandom</backend>
|
||||
</rng>
|
||||
<panic model="s390"/>
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
@ -1029,8 +1029,7 @@ c.add_compare("--connect %(URI-KVM-PPC64LE)s --import --disk %(EXISTIMG1)s --os-
|
||||
c.add_compare("--arch ppc64 --machine pseries --boot network --disk %(EXISTIMG1)s --graphics vnc --network none --tpm /dev/tpm0", "ppc64-pseries-tpm") # default TPM for ppc64
|
||||
|
||||
# s390x tests
|
||||
c.add_compare("--arch s390x --machine s390-ccw-virtio --connect %(URI-KVM-S390X)s --boot kernel=/kernel.img,initrd=/initrd.img --disk %(EXISTIMG1)s --disk %(EXISTIMG3)s,device=cdrom --os-variant fedora21", "s390x-cdrom", prerun_check=has_old_osinfo)
|
||||
c.add_compare("--arch s390x --machine s390-ccw-virtio --connect " + utils.URIs.kvm_s390x_KVMIBM + " --boot kernel=/kernel.img,initrd=/initrd.img --disk %(EXISTIMG1)s --disk %(EXISTIMG3)s,device=cdrom --os-variant fedora21 --watchdog diag288,action=reset --panic default --graphics vnc", "s390x-cdrom-KVMIBM")
|
||||
c.add_compare("--arch s390x --machine s390-ccw-virtio --connect %(URI-KVM-S390X)s --boot kernel=/kernel.img,initrd=/initrd.img --disk %(EXISTIMG1)s --disk %(EXISTIMG3)s,device=cdrom --os-variant fedora21 --panic default", "s390x-cdrom", prerun_check=has_old_osinfo)
|
||||
|
||||
# qemu:///session tests
|
||||
c.add_compare("--connect " + utils.URIs.kvm_session + " --disk size=8 --os-variant fedora21 --cdrom %(EXISTIMG1)s", "kvm-session-defaults", prerun_check=has_old_osinfo)
|
||||
|
||||
@ -108,7 +108,6 @@ class _URIs(object):
|
||||
self.kvm_aarch64 = _uri_kvm_aarch64 + _caps("kvm-aarch64.xml") + _domcaps("kvm-aarch64-domcaps.xml")
|
||||
self.kvm_ppc64le = _uri_kvm + _caps("kvm-ppc64le.xml")
|
||||
self.kvm_s390x = _uri_kvm + _caps("kvm-s390x.xml")
|
||||
self.kvm_s390x_KVMIBM = _uri_kvm + _caps("kvm-s390x-KVMIBM.xml")
|
||||
self.qemu_riscv64 = _uri_qemu_riscv64 + _caps("qemu-riscv64.xml")
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user