From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 1 Dec 2023 15:12:42 +0000 (+0100)
Subject: qemuxml2argvdata: Move 'smbios-multiple-type2' case to genericxml2xmltest
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2b9875d766659258ff459a52c178b303048b3f6e;p=libvirt.git

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

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>
---

diff --git a/tests/genericxml2xmlindata/smbios-multiple-type2.xml b/tests/genericxml2xmlindata/smbios-multiple-type2.xml
new file mode 100644
index 0000000000..275f7631b3
--- /dev/null
+++ b/tests/genericxml2xmlindata/smbios-multiple-type2.xml
@@ -0,0 +1,60 @@
+<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>
+  <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'>
+      <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'/>
+    <controller type='usb' index='0'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='virtio'/>
+  </devices>
+</domain>
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index 3cf9bd8159..6025054876 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -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");
diff --git a/tests/qemuxml2argvdata/smbios-multiple-type2.xml b/tests/qemuxml2argvdata/smbios-multiple-type2.xml
deleted file mode 100644
index 275f7631b3..0000000000
--- a/tests/qemuxml2argvdata/smbios-multiple-type2.xml
+++ /dev/null
@@ -1,60 +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>
-  <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'>
-      <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'/>
-    <controller type='usb' index='0'/>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <memballoon model='virtio'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
deleted file mode 100644
index dba587b330..0000000000
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
+++ /dev/null
@@ -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>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 1010b68ebc..8cc0874f65 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -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");