From b3dc3099a03383ed7f82cfe1e7bf1f1c912645fd Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 11 Jan 2011 11:11:37 +0100 Subject: [PATCH] moving to f14/kvm - on some h/w, create /root/no-kvm to run plain qemu instead --- system/template-qemu/qemu-kill-node | 2 +- system/template-qemu/qemu-start-node | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/system/template-qemu/qemu-kill-node b/system/template-qemu/qemu-kill-node index 6fdb161..2d84607 100755 --- a/system/template-qemu/qemu-kill-node +++ b/system/template-qemu/qemu-kill-node @@ -9,7 +9,7 @@ THISNODE=$(basename $(pwd -P) | sed -e s,qemu-,,) cd .. # somehow qemu-system-x86_64 show up in pgrep as qemu-system-x86 -COMMANDS_TO_KILL="qemu qemu-system-x86_64 qemu-system-x86" +COMMANDS_TO_KILL="qemu qemu-system-x86_64 qemu-system-x86 qemu-kvm" function usage () { echo "Usage: $COMMAND -l" diff --git a/system/template-qemu/qemu-start-node b/system/template-qemu/qemu-start-node index 55484f1..46279f8 100755 --- a/system/template-qemu/qemu-start-node +++ b/system/template-qemu/qemu-start-node @@ -46,7 +46,9 @@ function is_64bits () { # the launcher, depending on target arch # make sure to check qemu-kill-node for consistency -has_kvm=$(type -p qemu-kvm) + +# use kvm if available, but unless we find /root/no-kvm as this is broken on some h/w +[ -f /root/no-kvm ] || has_kvm=$(type -p qemu-kvm) if [ -n "has_kvm" ] ; then QEMU="qemu-kvm" ; ARGS="" else -- 2.47.0