From: Lei Xia <lxia@northwestern.edu>
Date: Mon, 25 Jan 2010 20:12:50 +0000 (-0600)
Subject: Add Vnet Configure
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=5624c95812302f7508c13830966714dba130a4f6

Add Vnet Configure
---

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index dbca7a8..bd19242 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -39,6 +39,10 @@
 #include <palacios/vmm_telemetry.h>
 #endif
 
+#ifdef CONFIG_VNET
+#include <palacios/vmm_vnet.h>
+#endif
+
 
 int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_info1, addr_t exit_info2) {
 
@@ -281,6 +285,11 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
     }
     // END OF SWITCH (EXIT_CODE)
 
+#ifdef CONFIG_VNET
+    v3_vnet_pkt_process(info);
+#endif
+
+
 #ifdef CONFIG_TELEMETRY
     if (info->enable_telemetry) {
 	v3_telemetry_end_exit(info, exit_code);
diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 81a37d3..002cf75 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -41,6 +41,10 @@
 
 #endif
 
+#ifdef CONFIG_VNET
+#include <palacios/vmm_vnet.h>
+#endif
+
 
 #include <palacios/vmm_host_events.h>
 #include <palacios/vmm_socket.h>
@@ -268,6 +272,10 @@ static int pre_config_guest(struct guest_info * info, struct v3_config * config_
     v3_init_sym_swap(info);
 #endif
 
+#ifdef CONFIG_VNET
+    v3_vnet_init(info);
+#endif
+
     if (schedule_hz_str) {
 	sched_hz = atoi(schedule_hz_str);
     }
diff --git a/palacios/src/palacios/vmx_handler.c b/palacios/src/palacios/vmx_handler.c
index 1da8a58..67f03a4 100644
--- a/palacios/src/palacios/vmx_handler.c
+++ b/palacios/src/palacios/vmx_handler.c
@@ -37,6 +37,10 @@
 #endif
 
 
+#ifdef CONFIG_VNET
+#include <palacios/vmm_vnet.h>
+#endif
+
 
 
 /* At this point the GPRs are already copied into the guest_info state */
@@ -222,6 +226,10 @@ int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_inf
             return -1;
     }
 
+#ifdef CONFIG_VNET
+    v3_vnet_pkt_process(info);
+#endif
+
 #ifdef CONFIG_TELEMETRY
     if (info->enable_telemetry) {
         v3_telemetry_end_exit(info, exit_info->exit_reason);