Makefile now only includes swintr stuff. Temporarily removed MSR-related stuff from...

diff --git a/palacios/src/extensions/Kconfig b/palacios/src/extensions/Kconfig
index fcdf0a3..cc5f7ef 100644 (file)
--- a/palacios/src/extensions/Kconfig
+++ b/palacios/src/extensions/Kconfig
@@ -85,12 +85,4 @@ config EXT_SYSCALL_PASSTHROUGH
       that are not explicitly hooked to be hooked for 
       passthrough. This is useful for debugging.
 
-config EXT_HIJACK_SYSCALL_MSR
-    bool "Intercept Syscall-related MSR reads & writes"
-    default n
-    help
-      Allow the VMM to intercept reads and writes to MSRs
-      related to SYSCALL and SYSENTER instructions. Specifically,
-      it will intercept R/W to STAR, CSTAR, and LSTAR, and SYSENTER_EIP.
-
 endmenu

diff --git a/palacios/src/extensions/Makefile b/palacios/src/extensions/Makefile
index 4c8d6a8..2365121 100644 (file)
--- a/palacios/src/extensions/Makefile
+++ b/palacios/src/extensions/Makefile
@@ -3,12 +3,6 @@ obj-$(V3_CONFIG_EXT_MTRRS) += ext_mtrr.o
 obj-$(V3_CONFIG_EXT_VTSC) += ext_vtsc.o
 obj-$(V3_CONFIG_EXT_VTIME) += ext_vtime.o
 obj-$(V3_CONFIG_EXT_INSPECTOR) += ext_inspector.o
-
-obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_syscall_hijack.o 
-obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_linux_syscall_map.o
-obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_mpi_accel.o
-obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_process_environment.o
-obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_execve_hook.o
-
 obj-$(V3_CONFIG_EXT_MACH_CHECK) += ext_mcheck.o
+obj-$(V3_CONFIG_EXT_SW_INTERRUPTS += ext_sw_intr.o