From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 22 Jul 2008 23:04:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: vmmhack1-ramdisk-boot-iso-puppy~52
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=23ee10c7be0d5c16226b2f703741842248add8e7

*** empty log message ***
---

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 2caba33..306b103 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -156,12 +156,13 @@ 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
-
+/*
+  #ifdef __V3VEE__
+  typedef struct guest_info v3_guest_t;
+  #else
+  typedef void v3_guest_t;
+  #endif
+*/
 
 
 //
@@ -219,11 +220,11 @@ struct vmm_os_hooks {
 
 /* 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)();
diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index e23e64e..6da9844 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -192,7 +192,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
   struct vmm_os_hooks os_hooks;
   struct vmm_ctrl_ops vmm_ops;
-  v3_guest_t* vm_info = 0;
+  struct guest_info * vm_info = 0;
   
 
 
diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 9ac1597..8b04b51 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -10,7 +10,7 @@ struct vmm_os_hooks * os_hooks = NULL;
 
 
 
-void * allocate_guest() {
+struct guest_info * allocate_guest() {
   void * info = V3_Malloc(sizeof(struct guest_info));
   memset(info, 0, sizeof(struct guest_info));
   return info;