tests: Drop irrelevant CPU config from graphics-spice-timeout

Resolves: https://gitlab.com/libvirt/libvirt/-/issues/243

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args
index 17b49e3169d1b3d23e5ecaddcf734d68561cfcf9..13c4c08e6f429ae1be9060c3d97ffd4ea2f2644e 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args
@@ -12,11 +12,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-f14/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-f14/master-key.aes"}' \
 -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
--cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \
+-cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
--smp 2,sockets=1,dies=1,cores=2,threads=1 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \
 -no-user-config \
 -nodefaults \

diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
index 57b48656b235695769c7512619c29f56018cf0a5..d1620b7df41a07cec5b518485da796e00422f4fa 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
@@ -15,24 +15,6 @@
     <apic/>
     <pae/>
   </features>
-  <cpu match='exact' check='none'>
-    <model>core2duo</model>
-    <vendor>Intel</vendor>
-    <topology sockets='1' dies='1' cores='2' threads='1'/>
-    <feature policy='require' name='ds'/>
-    <feature policy='require' name='acpi'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='ht'/>
-    <feature policy='require' name='tm'/>
-    <feature policy='require' name='pbe'/>
-    <feature policy='require' name='ds_cpl'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='est'/>
-    <feature policy='require' name='tm2'/>
-    <feature policy='require' name='cx16'/>
-    <feature policy='require' name='xtpr'/>
-    <feature policy='require' name='lahf_lm'/>
-  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
index 6f8a20950cf18928656af816d0bed223b4b24a91..6f1c0a6c939bb6144efa32adb212463f1b303280 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
@@ -16,22 +16,7 @@
     <pae/>
   </features>
   <cpu mode='custom' match='exact' check='none'>
-    <model fallback='allow'>core2duo</model>
-    <vendor>Intel</vendor>
-    <topology sockets='1' dies='1' cores='2' threads='1'/>
-    <feature policy='require' name='ds'/>
-    <feature policy='require' name='acpi'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='ht'/>
-    <feature policy='require' name='tm'/>
-    <feature policy='require' name='pbe'/>
-    <feature policy='require' name='ds_cpl'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='est'/>
-    <feature policy='require' name='tm2'/>
-    <feature policy='require' name='cx16'/>
-    <feature policy='require' name='xtpr'/>
-    <feature policy='require' name='lahf_lm'/>
+    <model fallback='forbid'>qemu64</model>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>