Changes for emulation stuff ...

3 files changed, 28 insertions, 4 deletions

diff --git a/src/os-plugins/plugins/emufe/files/run-virt.include b/src/os-plugins/plugins/emufe/files/run-virt.include
index c7e8ab03..ad0c8845 100644
--- a/src/os-plugins/plugins/emufe/files/run-virt.include
+++ b/src/os-plugins/plugins/emufe/files/run-virt.include
@@ -77,9 +77,14 @@ case "${emulator}" in
     cp ${diskfile} ${TMPDIR}
     # add cdrom if detected --cdrom /dev/srN
     # --screen win/1024/768 / dga/${xres}/${yres}
+    # if duplicated options the last one wins - user defined options should over-
+    # rule system options set here
+    USERCMDOPTS="$(echo "${emulator}" | tr "A-Z" "a-z")"
+    USERCMDOPTS="${USERCMDOPTS#*sheepshaver}"
     VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} --ramsize 128800000 --extfs ${HOME}"
-    VIRTCMDOPTS="${VIRTCMDOPTS} --ignoresegv true --ignoreillegal true"
-    VIRTCMDOPTS="${VIRTCMDOPTS} --gfxaccel true --disk ${TMPDIR}/${imgname}"
+    VIRTCMDOPTS="${VIRTCMDOPTS} --ignoresegv true --ignoreillegal true --gfxaccel true"
+    VIRTCMDOPTS="${VIRTCMDOPTS} --disk ${TMPDIR}/${imgname} ${USERCMDOPTS}"
+    VIRTCMD="SheepShaver"
   ;;
   basilisk*|Basilisk*)
     if [ "x${rombios}" != "x" ] ; then
@@ -89,11 +94,26 @@ case "${emulator}" in
     fi
     rm ~/.basilisk*
     cp ${diskfile} ${TMPDIR}
+    # check ordering of duplicated options (user defined options should over-
+    # rule system options set here
+    USERCMDOPTS="$(echo "${emulator}" | tr "A-Z" "a-z")"
+    USERCMDOPTS="${USERCMDOPTS#*basiliskii}"
     VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} --ramsize 16800000 --extfs ${HOME}"
     VIRTCMDOPTS="${VIRTCMDOPTS} --ignoresegv true --disk ${TMPDIR}/${imgname}"
+    VIRTCMDOPTS="${VIRTCMDOPTS} ${USERCMDOPTS}"
+    VIRTCMD="BasiliskII"
   ;;
   hatari*|Hatari*)
-
+    if [ "x${rombios}" != "x" ] ; then
+      rom="--tos ${imgpath}/${rombios}"
+    else
+      echo "problem"
+    fi
+    USERCMDOPTS="$(echo "${emulator}" | tr "A-Z" "a-z")"
+    USERCMDOPTS="${USERCMDOPTS#*hatari}"
+    VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} --memsize 14 --confirm-quite false"
+    VIRTCMDOPTS="${VIRTCMDOPTS} -d ${HOME} ${USERCMDOPTS}"
+    VIRTCMD="hatari"
   ;;
   *mess*)
     [ "x${rombios}" != "x" ] && rom="${imgpath}/${rombios}"
diff --git a/src/os-plugins/plugins/vmchooser/files/run-virt.sh b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
index deda552b..76ddacf9 100644
--- a/src/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -241,7 +241,7 @@ elif [ -z "${xmlvirt}" ]; then
     vmdk)
       xmlvirt="vmware"
     ;;
-    vbox)
+    vbox|vdi)
       xmlvirt="virtualbox"
     ;;
     qcow*)
diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index 9b9641bc..14b5f0c1 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -368,6 +368,10 @@ case "${vmostype}" in
   linux*|*ubuntu*|*suse*|debian*|*sci*)
     vmostype="linux"
   ;;
+  macos*)
+    numvcpus="1"
+    vmostype="other"
+  ;;
   *)
     vmostype="other"
   ;;