From a630773766aff0e507b15396297755b9835ebfc4813a8fc972c0d0b3dc3e5cfd Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 22 Jan 2014 11:46:30 +0000 Subject: [PATCH] Update kvm handling for sles11sp3 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=260 --- libguestfs.test.simple.create-opensuse-guest.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libguestfs.test.simple.create-opensuse-guest.sh b/libguestfs.test.simple.create-opensuse-guest.sh index 5213e5d..628b1a8 100644 --- a/libguestfs.test.simple.create-opensuse-guest.sh +++ b/libguestfs.test.simple.create-opensuse-guest.sh @@ -101,7 +101,20 @@ fi zypper --version cpio --version guestfish --version -qemu-system-`uname -m` --version +kvm="qemu-system-`uname -m`" +if $kvm --version +then + : good +else + kvm="qemu-kvm" + if $kvm --version + then + : + else + echo "No qemu-kvm found." + _exit + fi +fi mkdir -vp "${output_diskimage%/*}" td=`mktemp -d --tmpdir=/dev/shm/${LOGNAME}` @@ -250,7 +263,7 @@ case "${diskname_inside_vm}" in echo "${diskname_inside_vm} not handled" _exit esac -qemu-system-`uname -m` -enable-kvm \ +$kvm -enable-kvm \ -global virtio-blk-pci.scsi=off \ -enable-fips \ -machine accel=kvm:tcg \