X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios-vnet.c;h=a9553799cb42bc749c092858243cc129f1d10540;hb=c30d1b88a60c3a8df426ce81553675bbe4afef52;hp=429b33acae9a4a1f56c89621055eea4c3e8af4dc;hpb=f47bc5f7b2fa7169df0c618369224fffb12007b3;p=palacios.git

diff --git a/linux_module/palacios-vnet.c b/linux_module/palacios-vnet.c
index 429b33a..a955379 100644
--- a/linux_module/palacios-vnet.c
+++ b/linux_module/palacios-vnet.c
@@ -1,7 +1,8 @@
 /* 
-   Palacios VNET Host Hooks Implementations
-   (c) Lei Xia, 2011
+ * Palacios VNET Host Hooks Implementations 
+ * Lei Xia 2010
  */
+
 #include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/spinlock.h>
@@ -14,8 +15,9 @@
 #include <linux/timer.h>
 
 #include <vnet/vnet.h>
-#include "palacios-mm.h"
+#include "mm.h"
 #include "palacios-vnet.h"
+#include "linux-exts.h"
 
 static void host_print(const char *	fmt, ...) {
 
@@ -277,20 +279,35 @@ static struct vnet_host_hooks vnet_host_hooks = {
 
 
 
-int palacios_vnet_init( void ) {
+static int vnet_init( void ) {
     init_vnet(&vnet_host_hooks);
+	
+    vnet_bridge_init();
+    vnet_ctrl_init();
 
-    palacios_init_vnet_bridge();
     printk("V3 VNET Inited\n");
         
     return 0;
 }
 
 
-void palacios_vnet_deinit( void ) {
+static int vnet_deinit( void ) {
     deinit_vnet();
 
-    palacios_deinit_vnet_bridge();
+    vnet_bridge_deinit();
+    vnet_ctrl_deinit();
+
     printk("V3 VNET Deinited\n");
+
+    return 0;
 }
 
+static struct linux_ext vnet_ext = {
+    .name = "VNET",
+    .init = vnet_init,
+    .deinit = vnet_deinit,
+    .guest_init = NULL,
+    .guest_deinit = NULL
+};
+
+register_extension(&vnet_ext);