aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2015-01-22 16:36:23 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2015-01-22 16:36:23 -0500
commit2366a0e696dea04bdfef58b937d78d2f8b96ea9e (patch)
treef1163a56dd0f0b8a6278c69b2e797fa1567a6941
parent91fb79a6409668987511908b4cec6b11e38acfd3 (diff)
downloadkvm-manager-2366a0e696dea04bdfef58b937d78d2f8b96ea9e.tar.gz
kvm-manager-2366a0e696dea04bdfef58b937d78d2f8b96ea9e.tar.bz2
do not try to use sgabios if it is not installed and available
-rwxr-xr-xkvm-manager5
1 files changed, 4 insertions, 1 deletions
diff --git a/kvm-manager b/kvm-manager
index 467815b..45c7d66 100755
--- a/kvm-manager
+++ b/kvm-manager
@@ -80,6 +80,10 @@ up() {
[ \! -b "${!disk}" ] || KVMARGS="$KVMARGS -drive file=${!disk},if=virtio,cache=none,index=$index,format=raw"
done
+ if [ -e /usr/share/qemu/sgabios.bin ]; then
+ KVMARGS="$KVMARGS -device sga"
+ fi
+
LOGNAME="$OWNERHOME/vms/$VMNAME/console"
ln -sfT "$LOGNAME" ./servicelog
if [ -e "$LOGNAME" ] ; then
@@ -110,7 +114,6 @@ EOF
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0 \
-chardev "socket,id=serial0,path=$CONSOLENAME,server" -device isa-serial,chardev=serial0 \
- -device sga \
-smp "${SMP:-1},maxcpus=${MAXCPUS:-8}" \
-device "virtio-net-pci,vlan=0,id=net0,mac=$MAC,bus=pci.0" \
-net "tap,ifname=$TAP,script=no,downscript=no,vlan=0,name=hostnet0" &