From c94472dc0e24d234eb8e135cfcc4029018072dc3 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 23 Jun 2018 09:53:54 -0300
Subject: Check for requirements and use spicy as default spice_client

---
 kvmx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'kvmx')

diff --git a/kvmx b/kvmx
index 1718ac5..c6c9137 100755
--- a/kvmx
+++ b/kvmx
@@ -88,6 +88,9 @@ function __kvmx_initialize {
   export APP_BASE="`$DIRNAME/kvmx app_base`"
   source $APP_BASE/lib/kvmx/functions || exit 1
 
+  # Check dependencies
+  __kvmx_check_dependencies
+
   # Alias to be used in config files
   KVMX_BASE="$APP_BASE"
 
@@ -215,6 +218,10 @@ function __kvmx_initialize {
         echo "$BASENAME: WARNING: Intel VT or AMD-V not present at /proc/cpuinfo, expect slow performance"
       fi
 
+      if ! lsmod | grep -q '^kvm '; then
+        echo "$BASENAME: WARNING: kvm kernel module not loaded, expect slow performance"
+      fi
+
       if ! groups `whoami` | grep -q 'kvm'; then
         echo "$BASENAME: WARNING: user `whoami` not in kvm group, expect slow performance"
       fi
@@ -247,11 +254,14 @@ function kvmx_spice {
     spicy -h localhost -p $PORT &
   elif [ "$spice_client" == "virt-viewer" ] && which virt-viewer &> /dev/null; then
     remote-viewer spice://localhost:$PORT &
-  else
+  elif [ "$spice_client" == "spicec" ]; then
     if which spicec &> /dev/null; then
       # https://lists.freedesktop.org/archives/spice-devel/2013-September/014643.html
       SPICE_NOGRAB=1 spicec --host localhost --port $PORT &> $SPICELOG &
     fi
+  else
+    echo "$BASENAME: spice_client $spice_client not currently supported"
+    exit 1
   fi
 
   SPICEPID="$!"
-- 
cgit v1.2.3