X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=9fbc895c1af4a18790b005dbb177a4f4610e79c6;hb=af355c370ac80f8e19d6375cb3070213c29a92eb;hp=2caba33a4ba2dc2554a8bd52e4dd0b251308b1d2;hpb=a1e0475bbefa968791679c5e71232ddca522868b;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 2caba33..9fbc895 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -121,7 +121,7 @@
 
 #define V3_Hook_Interrupt(irq, opaque)				\
   ({								\
-    int ret = 0;							\
+    int ret = 0;						\
     extern struct vmm_os_hooks * os_hooks;			\
     if ((os_hooks) && (os_hooks)->hook_interrupt) {		\
       ret = (os_hooks)->hook_interrupt(irq, opaque);		\
@@ -156,12 +156,6 @@ typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CP
 
 #endif //!__V3VEE__
 
-#ifdef __V3VEE__
-typedef struct guest_info v3_guest_t;
-#else
-typedef void v3_guest_t;
-#endif
-
 
 
 //
@@ -212,18 +206,16 @@ struct vmm_os_hooks {
 
 
 
-  // Filled in by initialization
-
 };
 
 
 /* This will contain Function pointers that control the VMs */
 struct vmm_ctrl_ops {
-  void *(*allocate_guest)();
+  struct guest_info *(*allocate_guest)();
 
-  int (*config_guest)(v3_guest_t * info, void * config_ptr);
-  int (*init_guest)(v3_guest_t * info);
-  int (*start_guest)(v3_guest_t * info);
+  int (*config_guest)(struct guest_info * info, void * config_ptr);
+  int (*init_guest)(struct guest_info * info);
+  int (*start_guest)(struct guest_info * info);
   //  int (*stop_vm)(uint_t vm_id);
 
   int (*has_nested_paging)();