arrangement

Author: ddk50

Diff for: kvm/config.mak

@@ -1,3 +1,3 @@
 PREFIX=/usr/local
-KERNELDIR=../../../../linux
+KERNELDIR=../../windows-linux-compat
 WANT_MODULE=1

Diff for: kvm/kernel/Makefile

@@ -8,42 +8,42 @@ INSTALLDIR = $(patsubst %/build,%/extra,$(KERNELDIR))
 
 rpmrelease = devel
 
-LINUX = ../../../../linux
+LINUX = ../../windows-linux-compat
 
 EXTRA_CFLAGS +=
 
-all:: sync
+all::
 	$(MAKE) CC="gcc -D__WINKVM__ -save-temps" -C $(KERNELDIR) V=1 M=`pwd` "$$@"
 
-sync:
-##	rsync --exclude='*.mod.c' "$(LINUX)"/drivers/kvm/*.[ch] .
-	rsync "$(LINUX)"/include/linux/kvm.h \
-          "$(LINUX)"/include/linux/kvm_para.h \
-	      include/linux
-	rsync "$(LINUX)"/include/asm/winkvmmisc.h \
-          "$(LINUX)"/include/asm/msr-index.h \
-          "$(LINUX)"/include/asm/processor-flags.h \
-          "$(LINUX)"/include/asm/errno.h \
-          "$(LINUX)"/include/asm/winkvm86.h \
-           ../../windows-linux-compat/asm
-	rsync "$(LINUX)"/include/asm-generic/errno.h \
-           ../../windows-linux-compat/asm-generic
-	rsync "$(LINUX)"/include/linux/winwdm.h \
-          "$(LINUX)"/include/linux/winkvmint.h \
-          "$(LINUX)"/include/linux/winkvmlist.h \
-          "$(LINUX)"/include/linux/winkvmstab.h \
-          "$(LINUX)"/include/linux/winkvmtypes.h \
-          "$(LINUX)"/include/linux/winkvmgfp.h \
-          ../../windows-linux-compat/linux
-	rsync "$(LINUX)"/include/linux/winkvmint.h \
-		  "$(LINUX)"/include/linux/winkvmgfp.h \
-		  "$(LINUX)"/include/linux/winkvm.h \
-          ../../vcproj/include/linux
-	rsync ./vmx.h \
-		  ../../vcproj/include/linux
-	rsync "$(LINUX)"/include/linux/kvm.h \
-		  "$(LINUX)"/include/linux/winkvmtypes.h \
-		   ../../vcproj/include/linux
+# sync:
+# ##	rsync --exclude='*.mod.c' "$(LINUX)"/drivers/kvm/*.[ch] .
+# 	rsync "$(LINUX)"/include/linux/kvm.h \
+#           "$(LINUX)"/include/linux/kvm_para.h \
+# 	      include/linux
+# 	rsync "$(LINUX)"/include/asm/winkvmmisc.h \
+#           "$(LINUX)"/include/asm/msr-index.h \
+#           "$(LINUX)"/include/asm/processor-flags.h \
+#           "$(LINUX)"/include/asm/errno.h \
+#           "$(LINUX)"/include/asm/winkvm86.h \
+#            ../../windows-linux-compat/asm
+# 	rsync "$(LINUX)"/include/asm-generic/errno.h \
+#            ../../windows-linux-compat/asm-generic
+# 	rsync "$(LINUX)"/include/linux/winwdm.h \
+#           "$(LINUX)"/include/linux/winkvmint.h \
+#           "$(LINUX)"/include/linux/winkvmlist.h \
+#           "$(LINUX)"/include/linux/winkvmstab.h \
+#           "$(LINUX)"/include/linux/winkvmtypes.h \
+#           "$(LINUX)"/include/linux/winkvmgfp.h \
+#           ../../windows-linux-compat/linux
+# 	rsync "$(LINUX)"/include/linux/winkvmint.h \
+# 		  "$(LINUX)"/include/linux/winkvmgfp.h \
+# 		  "$(LINUX)"/include/linux/winkvm.h \
+#           ../../vcproj/include/linux
+# 	rsync ./vmx.h \
+# 		  ../../vcproj/include/linux
+# 	rsync "$(LINUX)"/include/linux/kvm.h \
+# 		  "$(LINUX)"/include/linux/winkvmtypes.h \
+# 		   ../../vcproj/include/linux
 # 	sed -i 's/f_path\./f_/' kvm_main.c
 # 	sed -i 's/f_mnt/f_vfsmnt/' kvm_main.c
 # 	mv kvm_main.c kvm_main.c.orig

Diff for: kvm/winkvm-qemu/config-host.h

@@ -97,6 +97,100 @@ bsd="no"
 linux="no"
 kqemu="no"
 profiler="no"
+#!/bin/sh
+#
+# qemu configure script (c) 2003 Fabrice Bellard
+#
+# set temporary file name
+if test ! -z "$TMPDIR" ; then
+    TMPDIR1="${TMPDIR}"
+elif test ! -z "$TEMPDIR" ; then
+    TMPDIR1="${TEMPDIR}"
+else
+    TMPDIR1="/tmp"
+fi
+
+TMPC="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.c"
+TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o"
+TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}"
+TMPS="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S"
+
+# default parameters
+prefix=""
+interp_prefix="/usr/gnemul/qemu-%M"
+static="no"
+cross_prefix=""
+cc="gcc"
+gcc3_search="yes"
+gcc3_list="gcc-3.4 gcc34 gcc-3.3 gcc33 gcc-3.2 gcc32"
+host_cc="gcc"
+ar="ar"
+make="make"
+install="install"
+strip="strip"
+cpu=`uname -m`
+target_list=""
+case "$cpu" in
+  i386|i486|i586|i686|i86pc|BePC)
+    cpu="i386"
+  ;;
+  armv*b)
+    cpu="armv4b"
+  ;;
+  armv*l)
+    cpu="armv4l"
+  ;;
+  alpha)
+    cpu="alpha"
+  ;;
+  "Power Macintosh"|ppc|ppc64)
+    cpu="powerpc"
+  ;;
+  mips)
+    cpu="mips"
+  ;;
+  s390)
+    cpu="s390"
+  ;;
+  sparc|sun4[muv])
+    cpu="sparc"
+  ;;
+  sparc64)
+    cpu="sparc64"
+  ;;
+  ia64)
+    cpu="ia64"
+  ;;
+  m68k)
+    cpu="m68k"
+  ;;
+  x86_64|amd64)
+    cpu="x86_64"
+  ;;
+  *)
+    cpu="unknown"
+  ;;
+esac
+gprof="no"
+bigendian="no"
+mingw32="no"
+EXESUF=""
+gdbstub="yes"
+slirp="yes"
+adlib="no"
+oss="no"
+dsound="no"
+coreaudio="no"
+alsa="no"
+fmod="no"
+fmod_lib=""
+fmod_inc=""
+bsd="no"
+linux="no"
+kqemu="no"
+kvm="no"
+profiler="no"
+kernel_path=""
 cocoa="no"
 check_gfx="yes"
 check_gcc="yes"
@@ -136,6 +230,7 @@ bsd="yes"
 oss="yes"
 if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
     kqemu="yes"
+	kvm="yes"	
 fi
 ;;
 NetBSD)
@@ -193,6 +288,7 @@ linux_user="yes"
 usb="linux"
 if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
     kqemu="yes"
+	kvm="yes"	
 fi
 ;;
 esac
@@ -284,6 +380,8 @@ for opt do
   ;;
   --disable-kqemu) kqemu="no"
   ;;
+  --enable-kvm) kvm="yes"
+  ;;    
   --enable-profiler) profiler="yes"
   ;;
   --enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"
@@ -394,6 +492,8 @@ echo "  --target-list=LIST       set target list [$target_list]"
 echo ""
 echo "kqemu kernel acceleration support:"
 echo "  --disable-kqemu          disable kqemu support"
+echo "  --kernel-path=PATH       set the kernel path (configure probes it)"
+echo "  --enable-kvm             enable kernel virtual machine support"
 echo ""
 echo "Advanced options (experts only):"
 echo "  --source-path=PATH       path of source code [$source_path]"
@@ -746,6 +846,7 @@ if test -n "$sparc_cpu"; then
     echo "Target Sparc Arch $sparc_cpu"
 fi
 echo "kqemu support     $kqemu"
+echo "kvm support       $kvm"
 echo "Documentation     $build_docs"
 [ ! -z "$uname_release" ] && \
 echo "uname -r          $uname_release"
@@ -1087,13 +1188,21 @@ elfload32="no"
 interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
 echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
 
+configure_kvm() {
+  if test $kvm = "yes" -a "$target_softmmu" = "yes" -a $cpu = "$target_cpu" ; then
+    echo "#define USE_KVM 1" >> $config_h
+    echo "CONFIG_KVM_KERNEL_INC=$kernel_path/include" >> $config_mak
+  fi
+}
+
 if test "$target_cpu" = "i386" ; then
   echo "TARGET_ARCH=i386" >> $config_mak
   echo "#define TARGET_ARCH \"i386\"" >> $config_h
   echo "#define TARGET_I386 1" >> $config_h
   if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "i386" ; then
     echo "#define USE_KQEMU 1" >> $config_h
   fi
+  configure_kvm  
 elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then
   echo "TARGET_ARCH=arm" >> $config_mak
   echo "#define TARGET_ARCH \"arm\"" >> $config_h
@@ -1149,6 +1258,7 @@ elif test "$target_cpu" = "x86_64" ; then
   if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64"  ; then
     echo "#define USE_KQEMU 1" >> $config_h
   fi
+  configure_kvm
 elif test "$target_cpu" = "mips" -o "$target_cpu" = "mipsel" ; then
   echo "TARGET_ARCH=mips" >> $config_mak
   echo "#define TARGET_ARCH \"mips\"" >> $config_h