mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
qemuxml2argv: Remove Haswell CPU from unrelated tests
Proper Haswell CPU model handling is tested in several qemuxml2argv-cpu-* which are run in a special environment. Let's remove the CPU model from other tests to make them less fragile. Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
parent
f7d8aa44b0
commit
528e70a29a
@ -2,7 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
|
|||||||
/usr/bin/qemu-system-x86_64 \
|
/usr/bin/qemu-system-x86_64 \
|
||||||
-S \
|
-S \
|
||||||
-M pc-i440fx-2.3 \
|
-M pc-i440fx-2.3 \
|
||||||
-cpu Haswell \
|
|
||||||
-m size=1048576k,slots=16,maxmem=1099511627776k \
|
-m size=1048576k,slots=16,maxmem=1099511627776k \
|
||||||
-smp 2 \
|
-smp 2 \
|
||||||
-object memory-backend-file,id=ram-node0,prealloc=yes,\
|
-object memory-backend-file,id=ram-node0,prealloc=yes,\
|
||||||
|
@ -17,8 +17,7 @@
|
|||||||
<apic/>
|
<apic/>
|
||||||
<pae/>
|
<pae/>
|
||||||
</features>
|
</features>
|
||||||
<cpu mode='custom' match='exact'>
|
<cpu>
|
||||||
<model fallback='allow'>Haswell</model>
|
|
||||||
<numa>
|
<numa>
|
||||||
<cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
|
<cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
|
||||||
</numa>
|
</numa>
|
||||||
|
@ -19,30 +19,7 @@
|
|||||||
<apic/>
|
<apic/>
|
||||||
<pae/>
|
<pae/>
|
||||||
</features>
|
</features>
|
||||||
<cpu mode='custom' match='exact'>
|
<cpu>
|
||||||
<model fallback='allow'>Haswell</model>
|
|
||||||
<vendor>Intel</vendor>
|
|
||||||
<feature policy='require' name='tm2'/>
|
|
||||||
<feature policy='require' name='est'/>
|
|
||||||
<feature policy='require' name='vmx'/>
|
|
||||||
<feature policy='require' name='osxsave'/>
|
|
||||||
<feature policy='require' name='smx'/>
|
|
||||||
<feature policy='require' name='ss'/>
|
|
||||||
<feature policy='require' name='ds'/>
|
|
||||||
<feature policy='require' name='vme'/>
|
|
||||||
<feature policy='require' name='dtes64'/>
|
|
||||||
<feature policy='require' name='abm'/>
|
|
||||||
<feature policy='require' name='ht'/>
|
|
||||||
<feature policy='require' name='acpi'/>
|
|
||||||
<feature policy='require' name='pbe'/>
|
|
||||||
<feature policy='require' name='tm'/>
|
|
||||||
<feature policy='require' name='pdcm'/>
|
|
||||||
<feature policy='require' name='pdpe1gb'/>
|
|
||||||
<feature policy='require' name='ds_cpl'/>
|
|
||||||
<feature policy='require' name='rdrand'/>
|
|
||||||
<feature policy='require' name='f16c'/>
|
|
||||||
<feature policy='require' name='xtpr'/>
|
|
||||||
<feature policy='require' name='monitor'/>
|
|
||||||
<numa>
|
<numa>
|
||||||
<cell id='0' cpus='0' memory='1048576' unit='KiB'/>
|
<cell id='0' cpus='0' memory='1048576' unit='KiB'/>
|
||||||
<cell id='1' cpus='1' memory='1048576' unit='KiB'/>
|
<cell id='1' cpus='1' memory='1048576' unit='KiB'/>
|
||||||
|
Loading…
Reference in New Issue
Block a user