Kqemu support for Solaris, by Ben Taylor.

diff --git a/configure b/configure
index 93bbe7b78b85d4de7e77f09439703d4d89cc3789..68c3fcc7b679293b50b338aa33d137d652677f2a 100755 (executable)
--- a/configure
+++ b/configure
@@ -151,6 +151,11 @@ if [ "$solaris" = "yes" ] ; then
     make="gmake"
     install="ginstall"
     solarisrev=`uname -r | cut -f2 -d.`
+    if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
+        if test "$solarisrev" -gt 10 ; then
+            kqemu="yes"
+        fi
+    fi
 fi
 
 # find source path

diff --git a/kqemu.c b/kqemu.c
index 5ba314f42bf25a4f094dc611e3d83704e9cfeb22..e01556adf5b38ec8fecd01df430dc74f2bc08e3c 100644 (file)
--- a/kqemu.c
+++ b/kqemu.c
@@ -26,6 +26,9 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 #endif
+#ifdef HOST_SOLARIS
+#include <sys/modctl.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/osdep.c b/osdep.c
index 1a4c03688e2fa1974bbc59d34eb32df8502ea3e9..d1eff8deb5cb0c2a529971c8a4b052d425c88554 100644 (file)
--- a/osdep.c
+++ b/osdep.c
@@ -27,6 +27,10 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#ifdef HOST_SOLARIS
+#include <sys/types.h>
+#include <sys/statvfs.h>
+#endif
 
 #include "cpu.h"
 #if defined(USE_KQEMU)
@@ -86,13 +90,22 @@ void *kqemu_vmalloc(size_t size)
     const char *tmpdir;
     char phys_ram_file[1024];
     void *ptr;
+#ifdef HOST_SOLARIS
+    struct statvfs stfs;
+#else
     struct statfs stfs;
+#endif
 
     if (phys_ram_fd < 0) {
         tmpdir = getenv("QEMU_TMPDIR");
         if (!tmpdir)
+#ifdef HOST_SOLARIS
+            tmpdir = "/tmp";
+        if (statvfs(tmpdir, &stfs) == 0) {
+#else
             tmpdir = "/dev/shm";
         if (statfs(tmpdir, &stfs) == 0) {
+#endif
             int64_t free_space;
             int ram_mb;