External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argvdata: Move 'smbios-multiple-type2' case to genericxml2xmltest

Browse Source 
The qemu driver explicitly rejects such configuration, thus this is just
a generic XML2XML test case. Move it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2023-12-01 16:12:42 +01:00
parent cd6a58e747
commit 2b9875d766
4 changed files with 2 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/qemuxml2argvdata/smbios-multiple-type2.xml → tests/genericxml2xmlindata/smbios-multiple-type2.xml
View File

2
tests/genericxml2xmltest.c
View File

@ -216,6 +216,8 @@ mymain(void)
DO_TEST_FAIL_INACTIVE("memorytune-colliding-allocs");
DO_TEST_FAIL_INACTIVE("memorytune-colliding-cachetune");
DO_TEST("smbios-multiple-type2");
DO_TEST("tseg");
DO_TEST("launch-security-sev");

71
tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
View File

@ -1,71 +0,0 @@
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219100</memory>
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<sysinfo type='smbios'>
<bios>
<entry name='vendor'>LENOVO</entry>
<entry name='version'>6FET82WW (3.12 )</entry>
</bios>
<system>
<entry name='manufacturer'>Fedora</entry>
<entry name='product'>Virt-Manager</entry>
<entry name='version'>0.8.2-3.fc14</entry>
<entry name='serial'>32dfcb37-5af1-552b-357c-be8c3aa38310</entry>
<entry name='uuid'>c7a5fdbd-edaf-9455-926a-d65c16db1809</entry>
<entry name='sku'>1234567890</entry>
<entry name='family'>Red Hat</entry>
</system>
<baseBoard>
<entry name='manufacturer'>Hewlett-Packard</entry>
<entry name='product'>0B4Ch</entry>
<entry name='version'>D</entry>
<entry name='serial'>CZC1065993</entry>
<entry name='asset'>CZC1065993</entry>
<entry name='location'>Upside down</entry>
</baseBoard>
<baseBoard>
<entry name='manufacturer'>Lenovo</entry>
<entry name='product'>20BE0061MC</entry>
<entry name='version'>0B98401 Pro</entry>
<entry name='serial'>W1KS427111E</entry>
<entry name='location'>Not Available</entry>
</baseBoard>
</sysinfo>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>qemu64</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>

1
tests/qemuxml2xmltest.c
View File

@ -761,7 +761,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("tap-vhost-incorrect");
DO_TEST_CAPS_LATEST("shmem-plain-doorbell");
DO_TEST_CAPS_LATEST("smbios");
DO_TEST_CAPS_LATEST("smbios-multiple-type2");
DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64");