Updated userspace guest memory access tools for regions, plus added new fast function...

[palacios.git] / linux_usr / Makefile

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index f459a1e..0cf09ce 100644 (file)
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -5,13 +5,13 @@
 
 # define this at the command-line or here
 # to get dynamically linked versions
-STATIC = 1
+STATIC = 0
 
 #
 # Executables that implement core functionality
 #
 BASE_EXECS =   v3_mem \
-                v3_mem_free \
+                v3_mem_reset \
                v3_create \
                 v3_create_bind \
                v3_free  \
@@ -27,7 +27,12 @@ BASE_EXECS =         v3_mem \
                v3_stream \
                v3_monitor \
                 v3_hypercall \
-               v3_debug
+               v3_debug \
+               v3_send \
+               v3_receive \
+               v3_pci \
+               v3_guest_mem_access
+
 
 #
 # Examples
@@ -35,7 +40,7 @@ BASE_EXECS =  v3_mem \
 EXAMPLE_EXECS = v3_user_host_dev_example \
                v3_os_debug \
                v3_user_keyed_stream_example \
-               v3_user_keyed_stream_file 
+               v3_user_keyed_stream_file \
 
 #
 # Currently experimental things
@@ -44,7 +49,8 @@ EXPERIMENTAL_EXECS =  v3_simulate  \
                        v3_inject_ecc_scrubber_mce  \
                         v3_top_inject \
                         v3_env_inject \
-                                               v3_syscall
+                       v3_syscall \
+                       v3_register_gm
 
 
 
@@ -54,12 +60,12 @@ EXPERIMENTAL_EXECS =        v3_simulate  \
 #
 PRECOMPILED_EXECS = x0vncserver
 
-COPIED_EXECS = v3_x0vncserver
+COPIED_EXECS = v3_x0vncserver v3_x0gui
 
 #
 # Libraries that we need to build
 #
-LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a
+LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a libv3_ctrl.a libv3_guest_mem.a libv3_fb.a
 
 BUILD_EXECS = $(BASE_EXECS) $(EXAMPLE_EXECS) $(EXPERIMENTAL_EXECS) 
 BUILD_LIBS = $(LIBS)
@@ -73,17 +79,29 @@ endif
 
 CFLAGS += -I../linux_module
 
-CC = gcc
+CC = gcc -g
 AR = ar
 
 all: $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
 
 
+libv3_ctrl.a : v3_ctrl.c v3_ctrl.h
+       $(CC) $(CFLAGS) -I../linux_module -c v3_ctrl.c
+       $(AR) ruv libv3_ctrl.a v3_ctrl.o
+       rm -rf v3_ctrl.o 
+
+#
+# JSON library for use in some tools
+#
+libjson.a : cJSON.c cJSON.h
+       $(CC) $(CFLAGS) -c cJSON.c
+       $(AR) ruv libjson.a cJSON.o
+       rm -rf cJSON.o
 #
 # Most tools compile in a straightforward way
 #
-% :: %.c v3_ctrl.h
-       $(CC) $(CFLAGS) $< -o $@
+% :: %.c v3_ctrl.h libv3_ctrl.a
+       $(CC) $(CFLAGS) $< -lv3_ctrl -L. -o $@
 
 
 #
@@ -91,13 +109,20 @@ all: $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
 #
 ifeq ($(STATIC),1)
   CURSES_CFLAGS = -DNCURSES_STATIC
+  CURSES_LIBS = -lcurses                           
+else
+  CURSES_CFLAGS = 
+  CURSES_LIBS = -lcurses 
 endif
 
 v3_cons: v3_cons.c
-       $(CC) $(CFLAGS) $(CURSES_CFLAGS) $< -lcurses -o $@
+       $(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -o $@
 
 v3_cons_sc: v3_cons_sc.c
-       $(CC) $(CFLAGS) $(CURSES_CFLAGS) $< -lcurses -o $@
+       $(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -o $@
+
+v3_create: v3_create.c ezxml.c libv3_ctrl.a 
+       $(CC) $(CFLAGS) $^ -lv3_ctrl -L. -o $@
 
 
 
@@ -115,6 +140,11 @@ v3_user_host_dev_example : v3_user_host_dev_example.c libv3_user_host_dev.a
 v3_os_debug : v3_os_debug.c libv3_user_host_dev.a
        $(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_host_dev -o $@
 
+#
+# Guarded module registration for GEARS
+#
+v3_register_gm: v3_register_gm.c libjson.a libv3_ctrl.a v3_ctrl.h
+       $(CC) $(CFLAGS) $< -L. -lm -lv3_ctrl -ljson -o $@
 
 #
 # User keyed stream support includes a library and examples
@@ -133,13 +163,52 @@ v3_user_keyed_stream_file : v3_user_keyed_stream_file.c libv3_user_keyed_stream.
        $(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_keyed_stream -o $@
 
 
+# guest memory access by mmap and example
+#
+libv3_guest_mem.a : v3_guest_mem.c v3_guest_mem.h v3_ctrl.h
+       $(CC) $(CFLAGS) -c v3_guest_mem.c 
+       $(AR) ruv libv3_guest_mem.a v3_guest_mem.o
+       rm -f v3_guest_mem.o
+
+v3_guest_mem_access : v3_guest_mem_access.c libv3_guest_mem.a
+       $(CC) $(CFLAGS) $< -L. -lv3_guest_mem -o $@
+
+
+#
+# FB (Graphics Console) user interface library (needed for VNC access
+#  to GC - also wraps mouse and keyboard event delivery)
+libv3_fb.a : v3_fb.c v3_fb.h
+       $(CC) $(CFLAGS) -I../linux_module -c v3_fb.c
+       $(AR) ruv libv3_fb.a v3_fb.o
+       rm -rf v3_fb.o 
+
+
 
 #
 # VNC support is compiled separately
 #
-v3_x0vncserver : x0vncserver
-       cp x0vncserver v3_x0vncserver
-
+v3_x0vncserver : 
+       @if [ -a x0vncserver ] ; \
+       then \
+               cp x0vncserver v3_x0vncserver ; \
+       else \
+               echo "In order to use v3_vncclient/server you must have" ; \
+               echo "previously built or received palacios/linux_usr/x0vncserver" ; \
+               echo "To learn more about this, look in palacios/linux_usr/vnc"; \
+       fi;
+
+#
+# GUI is compiled separately
+#
+v3_x0gui : 
+       @if [ -a gui/Palacios ] ; \
+       then \
+               cp gui/Palacios v3_x0gui ; \
+       else \
+               echo "In order to use v3_gui (the graphical interface)" ;\
+               echo "you must first cd to palacios/linux_usr/gui" ;\
+               echo "and compile it according to the README given there";\
+       fi;
 
 #
 # Cleanup and dependency builds are automated