X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2FMakefile;h=f10734c349aab5f1d244ba0ddc891562006e991c;hb=d0aa5bd27c22a33f04f47363910f9773fdeab7eb;hp=609a4a455ee94bc411ea49e71a5ea4e3c6ab6272;hpb=ab570b923abf061acf9f495e5f4178e8c2af0fcc;p=palacios.git

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index 609a4a4..f10734c 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -11,7 +11,7 @@ STATIC = 0
 # Executables that implement core functionality
 #
 BASE_EXECS = 	v3_mem \
-                v3_mem_free \
+                v3_mem_reset \
 		v3_create \
                 v3_create_bind \
 		v3_free  \
@@ -20,6 +20,7 @@ BASE_EXECS = 	v3_mem \
 		v3_pause  \
 		v3_continue \
 		v3_core_move \
+                v3_mem_move \
 		v3_load \
 		v3_save \
 		v3_cons \
@@ -30,7 +31,10 @@ BASE_EXECS = 	v3_mem \
 		v3_debug \
 		v3_send \
 		v3_receive \
-		v3_pci
+		v3_pci \
+		v3_guest_mem_access \
+		v3_guest_mem_track \
+                v3_dvfs
 
 
 #
@@ -40,7 +44,6 @@ EXAMPLE_EXECS = v3_user_host_dev_example \
 		v3_os_debug \
 		v3_user_keyed_stream_example \
 		v3_user_keyed_stream_file \
-		v3_guest_mem_example
 
 #
 # Currently experimental things
@@ -49,7 +52,8 @@ EXPERIMENTAL_EXECS = 	v3_simulate  \
 			v3_inject_ecc_scrubber_mce  \
                         v3_top_inject \
                         v3_env_inject \
-			v3_syscall
+			v3_syscall \
+			v3_register_gm
 
 
 
@@ -64,7 +68,7 @@ COPIED_EXECS = v3_x0vncserver v3_x0gui
 #
 # Libraries that we need to build
 #
-LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a libv3_ctrl.a libv3_guest_mem.a
+LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a libv3_ctrl.a libv3_guest_mem.a libv3_fb.a libv3_user_dvfs.a libv3_io_chan.so
 
 BUILD_EXECS = $(BASE_EXECS) $(EXAMPLE_EXECS) $(EXPERIMENTAL_EXECS) 
 BUILD_LIBS = $(LIBS)
@@ -76,9 +80,9 @@ ifeq ($(STATIC),1)
   CFLAGS += -static 
 endif
 
-CFLAGS += -I../linux_module
+CFLAGS += -I../linux_module -I../palacios/include/
 
-CC = gcc
+CC = gcc -g
 AR = ar
 
 all: $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
@@ -89,6 +93,19 @@ libv3_ctrl.a : v3_ctrl.c v3_ctrl.h
 	$(AR) ruv libv3_ctrl.a v3_ctrl.o
 	rm -rf v3_ctrl.o 
 
+libv3_io_chan.so: v3_io_chan.c v3_io_chan.h v3_user_host_dev.c v3_user_host_dev.h ../linux_module/iface-host-dev.h 
+	$(CC) $(CFLAGS) -I../linux_module -fPIC -c v3_io_chan.c
+	$(CC) $(CFLAGS) -I../linux_module -fPIC -c v3_user_host_dev.c
+	$(CC) -shared -o $@ v3_io_chan.o v3_user_host_dev.o
+	cp $@ /usr/lib64/
+	cp v3_io_chan.h /usr/include/
+#
+# 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
 #
@@ -132,6 +149,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
@@ -150,15 +172,40 @@ 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
+# guest memory access by mmap 
+# guest memory reference tracking via mem_track interface
+# examples
 #
 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_example : v3_guest_mem_example.c libv3_guest_mem.a
-	$(CC) $(CFLAGS) $< -L. -lv3_guest_mem -o $@
+v3_guest_mem_access : v3_guest_mem_access.c libv3_guest_mem.a libv3_ctrl.a
+	$(CC) $(CFLAGS) $< -L. -lv3_guest_mem -lv3_ctrl -o $@
+
+v3_guest_mem_track : v3_guest_mem_track.c libv3_guest_mem.a libv3_ctrl.a
+	$(CC) $(CFLAGS) $< -L. -lv3_guest_mem -lv3_ctrl -o $@
+
+#
+# User DVFS control includse a library and a caller
+#
+libv3_user_dvfs.a : v3_user_dvfs.c v3_user_dvfs.h v3_ctrl.h
+	$(CC) $(CFLAGS) -I../linux_module -c v3_user_dvfs.c 
+	$(AR) ruv libv3_user_dvfs.a v3_user_dvfs.o
+	rm -f v3_user_dvfs.o
+
+v3_dvfs : v3_dvfs.c libv3_user_dvfs.a libv3_ctrl.a
+	$(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_dvfs -lv3_ctrl -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 
 
 
 
@@ -172,6 +219,7 @@ 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;
 
 #