From: Jack Lange <jacklange@cs.pitt.edu>
Date: Mon, 2 May 2011 22:30:39 +0000 (-0500)
Subject: inspector updates
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=fc220749dd74a84f222b4a60c69a47e6ae743990

inspector updates
---

diff --git a/linux_module/Makefile b/linux_module/Makefile
index 1f11379..1262bb9 100644
--- a/linux_module/Makefile
+++ b/linux_module/Makefile
@@ -29,7 +29,7 @@ ifdef V3_CONFIG_STREAM
 endif
 
 ifdef V3_CONFIG_EXT_INSPECTOR
-	v3vee-objs += palacios-debugfs.o
+	v3vee-objs += palacios-inspector.o
 endif
 
 ifdef V3_CONFIG_VNET
diff --git a/linux_module/palacios-debugfs.h b/linux_module/palacios-debugfs.h
deleted file mode 100644
index 1caad52..0000000
--- a/linux_module/palacios-debugfs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* 
- * DebugFS interface
- * (c) Jack Lange, 2011
- */
-
-#include "palacios.h"
-
-int palacios_init_debugfs( void );
-int palacios_deinit_debugfs( void );
-
-
-
-int dfs_register_vm(struct v3_guest * guest);
-
diff --git a/linux_module/palacios-dev.c b/linux_module/palacios-dev.c
index bb9598f..2de0393 100644
--- a/linux_module/palacios-dev.c
+++ b/linux_module/palacios-dev.c
@@ -29,7 +29,7 @@
 #include "palacios-packet.h"
 
 #ifdef V3_CONFIG_EXT_INSPECTOR
-#include "palacios-debugfs.h"
+#include "palacios-inspector.h"
 #endif
 
 MODULE_LICENSE("GPL");
@@ -253,8 +253,8 @@ static int __init v3_init(void) {
     palacios_init_console();
 #endif
 
-#ifdef V3_CONFIG_INSPECTOR
-    palacios_init_debugfs();
+#ifdef V3_CONFIG_EXT_INSPECTOR
+    palacios_init_inspector();
 #endif
 
 #ifdef V3_CONFIG_SOCKET
@@ -311,7 +311,7 @@ static void __exit v3_exit(void) {
 
 
 #ifdef V3_CONFIG_EXT_INSPECTOR
-    palacios_deinit_debugfs();
+    palacios_deinit_inspector();
 #endif
 
 #ifdef V3_CONFIG_FILE
diff --git a/linux_module/palacios-debugfs.c b/linux_module/palacios-inspector.c
similarity index 80%
rename from linux_module/palacios-debugfs.c
rename to linux_module/palacios-inspector.c
index b35120e..a3b5ac9 100644
--- a/linux_module/palacios-debugfs.c
+++ b/linux_module/palacios-inspector.c
@@ -15,7 +15,7 @@
 struct dentry * v3_dir = NULL;
 
 
-int palacios_init_debugfs( void ) {
+int palacios_init_inspector( void ) {
 
     v3_dir = debugfs_create_dir("v3vee", NULL);
 
@@ -28,7 +28,7 @@ int palacios_init_debugfs( void ) {
 }
 
 
-int palacios_deinit_debugfs( void ) {
+int palacios_deinit_inspector( void ) {
     debugfs_remove(v3_dir);
     return 0;
 }
@@ -66,14 +66,23 @@ static int dfs_register_tree(struct dentry * dir, v3_inspect_node_t * root) {
 }
 
 
-int dfs_register_vm(struct v3_guest * guest) {
+int inspect_vm(struct v3_guest * guest) {
     v3_inspect_node_t * root = v3_get_inspection_root(guest->v3_ctx);
+    struct dentry * guest_dir = NULL;
+
 
     if (root == NULL) {
 	printk("No inspection root found\n");
     	return -1;
     }
 
-    dfs_register_tree(v3_dir, root);
+    guest_dir = debugfs_create_dir(guest->name, v3_dir);
+
+    if (IS_ERR(guest_dir)) {
+	printk("Error Creating inspector tree for VM \"%s\"\n", guest->name);
+	return -1;
+    }
+
+    dfs_register_tree(guest_dir, root);
     return 0;
 }
diff --git a/linux_module/palacios-inspector.h b/linux_module/palacios-inspector.h
new file mode 100644
index 0000000..ad966df
--- /dev/null
+++ b/linux_module/palacios-inspector.h
@@ -0,0 +1,14 @@
+/* 
+ * DebugFS interface
+ * (c) Jack Lange, 2011
+ */
+
+#include "palacios.h"
+
+int palacios_init_inspector( void );
+int palacios_deinit_inspector( void );
+
+
+
+int inspect_vm(struct v3_guest * guest);
+
diff --git a/linux_module/palacios-vm.c b/linux_module/palacios-vm.c
index 3490548..29cafd7 100644
--- a/linux_module/palacios-vm.c
+++ b/linux_module/palacios-vm.c
@@ -32,7 +32,7 @@
 #endif
 
 #ifdef V3_CONFIG_EXT_INSPECTOR
-#include "palacios-debugfs.h"
+#include "palacios-inspector.h"
 #endif
 
 
@@ -172,7 +172,7 @@ int start_palacios_vm(void * arg)  {
 
 
 #if V3_CONFIG_EXT_INSPECTOR
-    dfs_register_vm(guest);
+    inspect_vm(guest);
 #endif