move vnet code outside of palacios core directory

diff --git a/Kconfig b/Kconfig
index a524683..ffe5e0c 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -163,14 +163,6 @@ config EXPERIMENTAL
          The purpose of this option is to allow features under development to be committed to the mainline
          to more easily track changes and provide access to multiple developers
 
-config VNET
-        depends on EXPERIMENTAL
-        bool "Enable Vnet in Palacios"
-        default n
-        help
-          Enable the Vnet in Palacios
-
-
 endmenu
 
 
@@ -284,7 +276,15 @@ menuconfig SYMMOD
 
 endmenu
 
+menu "VNET"
 
+config VNET
+        bool "Enable Vnet in Palacios"
+        default n
+        help
+          Enable the Vnet in Palacios
+
+endmenu
 
 menu "Debug configuration"
 

diff --git a/Makefile b/Makefile
index f65e7d6..1b14317 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -436,6 +436,7 @@ libs-y              := palacios/lib/$(ARCH)/
 devices-y       := palacios/src/devices/
 interfaces-y    := palacios/src/interfaces/
 extensions-y    := palacios/src/extensions/
+vnet-y          := palacios/src/vnet/
 modules-y       := modules/
 
 
@@ -530,7 +531,7 @@ export      INSTALL_PATH ?= /build
 
 
 palacios-dirs  := $(patsubst %/,%,$(filter %/,  \
-                    $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(libs-y)) $(modules-y))
+                    $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(vnet-y) $(libs-y)) $(modules-y))
 
 
 
@@ -541,7 +542,7 @@ palacios-dirs       := $(patsubst %/,%,$(filter %/,  \
 
 palacios-cleandirs := $(sort $(palacios-dirs) $(patsubst %/,%,$(filter %/, \
                        $(core-n) $(core-) $(devices-n) $(devices-) \
-                       $(interfaces-n) $(interfaces-) $(extensions-n) $(extensions-) $(modules-n) $(modules-))))
+                       $(interfaces-n) $(interfaces-) $(extensions-n) $(extensions-) $(vnet-n) $(vnet-) $(modules-n) $(modules-))))
 
 
 
@@ -550,6 +551,7 @@ devices-y   := $(patsubst %/, %/built-in.o, $(devices-y))
 interfaces-y    := $(patsubst %/, %/built-in.o, $(interfaces-y))
 extensions-y    := $(patsubst %/, %/built-in.o, $(extensions-y))
 libs-y         := $(patsubst %/, %/built-in.o, $(libs-y))
+vnet-y          := $(patsubst %/, %/built-in.o, $(vnet-y))
 modules-y       := $(patsubst %/, %/built-in.o, $(modules-y))
 #lnxmod-y        := $(patsubst %/, %/built-in.o, $(lnxmod-y))
 
@@ -575,7 +577,7 @@ modules-y       := $(patsubst %/, %/built-in.o, $(modules-y))
 
 
 
-palacios := $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(libs-y) $(modules-y)
+palacios := $(core-y) $(devices-y) $(interfaces-y) $(extensions-y) $(vnet-y) $(libs-y) $(modules-y)
 
 
 # Rule to link palacios - also used during CONFIG_CONFIGKALLSYMS

diff --git a/linux_module/palacios-vnet.c b/linux_module/palacios-vnet.c
index 3f6f899..454cd8d 100644 (file)
--- a/linux_module/palacios-vnet.c
+++ b/linux_module/palacios-vnet.c
@@ -17,7 +17,6 @@
 #include <linux/sched.h>
 #include <asm/msr.h>
 
-#include <palacios/vmm_vnet.h>
 #include "palacios-vnet.h"
 
 //#define DEBUG_VNET_BRIGE
@@ -877,7 +876,7 @@ send_to_palacios(unsigned char * buf,
     }
 #endif
 
-    return v3_vnet_send_pkt(&pkt, NULL);;
+    return v3_vnet_send_pkt(&pkt, NULL, 1);
 }
 
 

diff --git a/linux_module/palacios-vnet.h b/linux_module/palacios-vnet.h
index 98f8dce..edc3687 100644 (file)
--- a/linux_module/palacios-vnet.h
+++ b/linux_module/palacios-vnet.h
@@ -6,7 +6,7 @@
 #ifndef __PALACIOS_VNET_BRIDGE_H__
 #define __PALACIOS_VNET_BRIDGE_H__
 
-#include <palacios/vmm_vnet.h>
+#include <vnet/vnet.h>
 
 int  palacios_init_vnet(void);
 

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/vnet/vnet.h
similarity index 100%
rename from palacios/include/palacios/vmm_vnet.h
rename to palacios/include/vnet/vnet.h

diff --git a/palacios/include/palacios/vnet_interface.h b/palacios/include/vnet/vnet_host_interface.h
similarity index 100%
rename from palacios/include/palacios/vnet_interface.h
rename to palacios/include/vnet/vnet_host_interface.h

diff --git a/palacios/src/palacios/Makefile b/palacios/src/palacios/Makefile
index 8fba939..4c55738 100644 (file)
--- a/palacios/src/palacios/Makefile
+++ b/palacios/src/palacios/Makefile
@@ -67,9 +67,6 @@ obj-$(V3_CONFIG_VMX) +=       vmx.o \
 
 obj-$(V3_CONFIG_TELEMETRY) += vmm_telemetry.o 
 
-obj-$(V3_CONFIG_VNET) += vmm_vnet_core.o
-
-
 obj-$(V3_CONFIG_SYMBIOTIC) += vmm_symbiotic.o vmm_symspy.o
 obj-$(V3_CONFIG_SYMCALL) += vmm_symcall.o
 obj-$(V3_CONFIG_SYMMOD) += vmm_symmod.o

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index ebcdfb8..f3bce6f 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -34,7 +34,7 @@
 #endif
 
 #ifdef V3_CONFIG_VNET
-#include <palacios/vmm_vnet.h>
+#include <vnet/vnet.h>
 #endif
 
 

diff --git a/palacios/src/vnet/Makefile b/palacios/src/vnet/Makefile
new file mode 100644 (file)
index 0000000..b573071
--- /dev/null
+++ b/palacios/src/vnet/Makefile
@@ -0,0 +1,2 @@
+obj-$(V3_CONFIG_VNET) +=  vnet_core.o
+

diff --git a/palacios/src/palacios/vmm_vnet_core.c b/palacios/src/vnet/vnet_core.c
similarity index 99%
rename from palacios/src/palacios/vmm_vnet_core.c
rename to palacios/src/vnet/vnet_core.c
index c3d9603..9bf044a 100644 (file)
--- a/palacios/src/palacios/vmm_vnet_core.c
+++ b/palacios/src/vnet/vnet_core.c
@@ -19,7 +19,7 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
  
-#include <palacios/vmm_vnet.h>
+#include <vnet/vnet.h>
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmm_lock.h>
 #include <palacios/vmm_queue.h>
@@ -708,7 +708,7 @@ int v3_vnet_add_bridge(struct v3_vm_info * vm,
     return 0;
 }
 
-
+#if 0
 static int vnet_tx_flush(void *args){
     unsigned long flags;
     struct queue_entry * entry;
@@ -743,6 +743,7 @@ static int vnet_tx_flush(void *args){
        }
     }
 }
+#endif
 
 int v3_init_vnet() {
     memset(&vnet_state, 0, sizeof(vnet_state));
@@ -765,7 +766,7 @@ int v3_init_vnet() {
 
     v3_lock_init(&(vnet_state.pkt_q.lock));
 
-    vnet_state.pkt_flush_thread = V3_CREATE_THREAD(vnet_tx_flush, NULL, "VNET_Pkts");
+    //vnet_state.pkt_flush_thread = V3_CREATE_THREAD(vnet_tx_flush, NULL, "VNET_Pkts");
 
     PrintDebug("VNET/P Core is initiated\n");