]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Fix QEMU XML-2-ARGV graphics-spice-timeout test
authorMatthias Bolte <matthias.bolte@googlemail.com>
Wed, 1 Jun 2011 16:11:14 +0000 (18:11 +0200)
committerMatthias Bolte <matthias.bolte@googlemail.com>
Wed, 1 Jun 2011 16:34:59 +0000 (18:34 +0200)
The test used an emulator that is not supported in testutilsqemu.c.
Switch from qemu-kvm to kvm to fix this.

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml

index bb414d6d6b994d817df30c5dbcd93f63cae1bd3c..d5226a7401aba09e4cb9f4a8fde29e230433fdb0 100644 (file)
@@ -1,5 +1,5 @@
 LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-kvm -S -M pc-0.13 -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,\
+/usr/bin/kvm -S -M pc-0.13 -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,\
 +est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,+ds \
 -m 1024 -smp 2 -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \
 -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
index aaa4469c426b99dd0e4cc09776d2384cb49acc1d..6272f1bd22c5574617a1d8422352195a3d860bbf 100644 (file)
@@ -38,7 +38,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/kvm</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/var/lib/libvirt/images/f14.img'/>