remove ioctl interface to initiate network service

[palacios.git] / linux_module / palacios-dev.c

diff --git a/linux_module/palacios-dev.c b/linux_module/palacios-dev.c
index 8b30352..e1143f8 100644 (file)
--- a/linux_module/palacios-dev.c
+++ b/linux_module/palacios-dev.c
@@ -24,9 +24,19 @@
 #include "palacios-stream.h"
 #include "palacios-file.h"
 #include "palacios-serial.h"
+#include "palacios-socket.h"
+#include "palacios-vnet.h"
+#include "palacios-packet.h"
+
+#ifdef CONFIG_DEBUG_FS
+#include "palacios-debugfs.h"
+#endif
 
 MODULE_LICENSE("GPL");
 
+int mod_allocs = 0;
+int mod_frees = 0;
+
 
 static int v3_major_num = 0;
 
@@ -76,9 +86,9 @@ static long v3_dev_ioctl(struct file * filp,
 
     switch (ioctl) {
        case V3_START_GUEST:{
+           int vm_minor = 0;
            struct v3_guest_img user_image;
            struct v3_guest * guest = kmalloc(sizeof(struct v3_guest), GFP_KERNEL);
-           int vm_minor = 0;
 
            if (IS_ERR(guest)) {
                printk("Error allocating Kernel guest_image\n");
@@ -162,6 +172,7 @@ static long v3_dev_ioctl(struct file * filp,
 
            break;
        }
+
        default: 
            printk("\tUnhandled\n");
            return -EINVAL;
@@ -234,6 +245,23 @@ static int __init v3_init(void) {
     palacios_file_init();
     palacios_init_console();
 
+
+#ifdef CONFIG_DEBUG_FS
+    palacios_init_debugfs();
+#endif
+
+#ifdef CONFIG_PALACIOS_SOCKET
+    palacios_socket_init();
+#endif
+
+#ifdef CONFIG_PALACIOS_PACKET
+    palacios_init_packet(NULL);
+#endif
+
+#ifdef CONFIG_PALACIOS_VNET
+    palacios_init_vnet();
+#endif
+
     return 0;
 
  failure1:
@@ -251,6 +279,11 @@ static void __exit v3_exit(void) {
     extern u32 mallocs;
     extern u32 frees;
 
+
+    // should probably try to stop any guests
+
+
+
     dev_t dev = MKDEV(v3_major_num, MAX_VMS + 1);
 
     printk("Removing V3 Control device\n");
@@ -267,9 +300,39 @@ static void __exit v3_exit(void) {
 
     device_destroy(v3_class, dev);
     class_destroy(v3_class);
+
+
+
+#ifdef CONFIG_DEBUG_FS
+    palacios_deinit_debugfs();
+#endif
+
+    palacios_file_deinit();
+    palacios_deinit_stream();
+
+    palacios_deinit_mm();
+
+    printk("Palacios Module Mallocs = %d, Frees = %d\n", mod_allocs, mod_frees);
 }
 
 
 
 module_init(v3_init);
 module_exit(v3_exit);
+
+
+
+void * trace_malloc(size_t size, gfp_t flags) {
+    void * addr = NULL;
+
+    mod_allocs++;
+    addr = kmalloc(size, flags);
+
+    return addr;
+}
+
+
+void trace_free(const void * objp) {
+    mod_frees++;
+    kfree(objp);
+}