X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_extensions.h;h=67d6f86f72a84d7c2547124add5224d06ddb5ff5;hb=40b983b217e8b8d0881309a9440195abbfdcce57;hp=0135f880ae33de4e15e844dbdc21325950657e69;hpb=f18097c35ddc13572ab41e03ad7a14430cff11ac;p=palacios.git

diff --git a/palacios/include/palacios/vmm_extensions.h b/palacios/include/palacios/vmm_extensions.h
index 0135f88..67d6f86 100644
--- a/palacios/include/palacios/vmm_extensions.h
+++ b/palacios/include/palacios/vmm_extensions.h
@@ -23,8 +23,8 @@
 #ifdef __V3VEE__
 
 #include <palacios/vmm.h>
-#include <palacios/vmm_list.h>
 #include <palacios/vmm_config.h>
+#include <palacios/vmm_list.h>
 
 
 struct v3_vm_info;
@@ -39,12 +39,13 @@ struct v3_extensions {
 
 struct v3_extension_impl {
     char * name;
-    int (*init)(struct v3_vm_info * vm, v3_cfg_tree_t * cfg, void ** priv_data);
-    int (*deinit)(struct v3_vm_info * vm, void * priv_data);
-    int (*core_init)(struct guest_info * core);
-    int (*core_deinit)(struct guest_info * core);
-    int (*on_entry)(struct guest_info * core);
-    int (*on_exit)(struct guest_info * core);
+    int (*init)();
+    int (*vm_init)(struct v3_vm_info * vm, v3_cfg_tree_t * cfg, void ** priv_data);
+    int (*vm_deinit)(struct v3_vm_info * vm, void * priv_data);
+    int (*core_init)(struct guest_info * core, void * priv_data, void ** core_data);
+    int (*core_deinit)(struct guest_info * core, void * priv_data, void * core_data);
+    int (*on_entry)(struct guest_info * core, void * priv_data);
+    int (*on_exit)(struct guest_info * core, void * priv_data);
 };
 
 struct v3_extension {
@@ -54,6 +55,9 @@ struct v3_extension {
     struct list_head node;
     struct list_head exit_node;
     struct list_head entry_node;
+
+    // KCH: has to be last entry in this struct
+    void * core_ext_priv_data[0];
 };
 
 
@@ -63,7 +67,13 @@ int V3_deinit_extensions();
 
 
 int v3_init_ext_manager(struct v3_vm_info * vm);
+int v3_deinit_ext_manager(struct v3_vm_info * vm);
 int v3_add_extension(struct v3_vm_info * vm, const char * name, v3_cfg_tree_t * cfg);
+int v3_init_core_extensions(struct guest_info * core);
+int v3_deinit_core_extensions(struct guest_info * core);
+
+void * v3_get_extension_state(struct v3_vm_info * vm, const char * name);
+void * v3_get_ext_core_state (struct guest_info * core, const char * name);
 
 
 #define register_extension(ext)					\