updates to enable functionality necessary for SEABIOS to run

[palacios.git] / linux_module / main.c

diff --git a/linux_module/main.c b/linux_module/main.c
index ab6d9f2..f465eaa 100644 (file)
--- a/linux_module/main.c
+++ b/linux_module/main.c
@@ -57,7 +57,7 @@ int mod_frees = 0;
 static int v3_major_num = 0;
 
 static struct v3_guest * guest_map[MAX_VMS] = {[0 ... MAX_VMS - 1] = 0};
-static struct proc_dir_entry *dir = 0;
+struct proc_dir_entry * palacios_proc_dir = NULL;
 
 struct class * v3_class = NULL;
 static struct cdev ctrl_dev;
@@ -232,7 +232,7 @@ static struct file_operations v3_ctrl_fops = {
 
 struct proc_dir_entry *palacios_get_procdir(void) 
 {
-    return dir;
+    return palacios_proc_dir;
 }
 
 
@@ -327,17 +327,6 @@ static int read_guests(char * buf, char ** start, off_t off, int count,
     return len;
 }
 
-static int show_mem(char * buf, char ** start, off_t off, int count,
-                   int * eof, void * data)
-{
-    int len = 0;
-    
-    len = snprintf(buf,count, "%p\n", (void *)get_palacios_base_addr());
-    len += snprintf(buf+len,count-len, "%lld\n", get_palacios_num_pages());
-    
-    return len;
-}
-
 
 
 
@@ -397,11 +386,11 @@ static int __init v3_init(void) {
        goto failure1;
     }
 
-    dir = proc_mkdir("v3vee", NULL);
-    if(dir) {
+    palacios_proc_dir = proc_mkdir("v3vee", NULL);
+    if (palacios_proc_dir) {
        struct proc_dir_entry *entry;
 
-       entry = create_proc_read_entry("v3-guests", 0444, dir, 
+       entry = create_proc_read_entry("v3-guests", 0444, palacios_proc_dir, 
                                       read_guests, NULL);
         if (entry) {
            INFO("/proc/v3vee/v3-guests successfully created\n");
@@ -410,14 +399,6 @@ static int __init v3_init(void) {
            goto failure1;
        }
        
-       entry = create_proc_read_entry("v3-mem", 0444, dir,
-                                      show_mem, NULL);
-       if (entry) {
-           INFO("/proc/v3vee/v3-mem successfully added\n");
-       } else {
-           ERROR("Could not create proc entry\n");
-           goto failure1;
-       }
     } else {
        ERROR("Could not create proc entry\n");
        goto failure1;
@@ -486,8 +467,7 @@ static void __exit v3_exit(void) {
 
     palacios_deinit_mm();
 
-    remove_proc_entry("v3-guests", dir);
-    remove_proc_entry("v3-mem", dir);
+    remove_proc_entry("v3-guests", palacios_proc_dir);
     remove_proc_entry("v3vee", NULL);
 
     DEBUG("Palacios Module Mallocs = %d, Frees = %d\n", mod_allocs, mod_frees);