Correct VM deallocation on fail before nested paging init

[palacios.git] / palacios / include / palacios / vmm_direct_paging.h

diff --git a/palacios/include/palacios/vmm_direct_paging.h b/palacios/include/palacios/vmm_direct_paging.h
index 925a299..6e1a3b5 100644 (file)
--- a/palacios/include/palacios/vmm_direct_paging.h
+++ b/palacios/include/palacios/vmm_direct_paging.h
@@ -26,6 +26,7 @@
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_paging.h>
 #include <palacios/vmm_list.h>
+#include <palacios/vmm_lock.h>
  
 
 /**********************************
@@ -37,7 +38,9 @@ struct v3_passthrough_impl_state {
     // currently there is only a single implementation
     // that internally includes SVM and VMX support
     // The externally visible state is just the callbacks
+    v3_rw_lock_t     event_callback_lock;
     struct list_head event_callback_list;
+    int              inited; 
 };
 
 
@@ -91,7 +94,7 @@ int v3_register_passthrough_paging_event_callback(struct v3_vm_info *vm,
 
 int v3_unregister_passthrough_paging_event_callback(struct v3_vm_info *vm,
                                                    int (*callback)(struct guest_info *core, 
-                                                                   struct v3_passthrough_pg_event,
+                                                                   struct v3_passthrough_pg_event *,
                                                                    void      *priv_data),
                                                    void *priv_data);
 
@@ -106,7 +109,9 @@ struct v3_nested_impl_state {
     // currently there is only a single implementation
     // that internally includes SVM and VMX support
     // The externally visible state is just the callbacks
+    v3_rw_lock_t     event_callback_lock;
     struct list_head event_callback_list;
+    int              inited; 
 };
 
 int v3_init_nested_paging(struct v3_vm_info *vm);
@@ -155,7 +160,7 @@ int v3_register_nested_paging_event_callback(struct v3_vm_info *vm,
 
 int v3_unregister_nested_paging_event_callback(struct v3_vm_info *vm,
                                               int (*callback)(struct guest_info *core, 
-                                                              struct v3_nested_pg_event,
+                                                              struct v3_nested_pg_event *,
                                                               void      *priv_data),
                                               void *priv_data);