added a configuration structure for the binary inputs to the vmm (ramdisk, bios)

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index b8728b4..cbe2f80 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -148,6 +148,17 @@
     ret;                                                       \
   })                                                           \
 
+#define V3_Yield(addr)                                 \
+  do {                                                 \
+    extern struct vmm_os_hooks * os_hooks;             \
+    if ((os_hooks) && (os_hooks)->yield_cpu) {         \
+      (os_hooks)->yield_cpu();                         \
+    }                                                  \
+  } while (0)                                          \
+
+
+
+
 
 /* ** */
 
@@ -223,16 +234,25 @@ struct vmm_os_hooks {
 
   void (*start_kernel_thread)(); // include pointer to function
 
+  void (*yield_cpu)();
+
+};
 
 
+struct v3_vm_config {
+  void * vm_kernel;
+  int use_ramdisk;
+  void * ramdisk;
+  int ramdisk_size;
 };
 
 
+
 /* This will contain Function pointers that control the VMs */
 struct vmm_ctrl_ops {
   struct guest_info *(*allocate_guest)();
 
-  int (*config_guest)(struct guest_info * info, void * config_ptr);
+  int (*config_guest)(struct guest_info * info, struct v3_vm_config * config_ptr);
   int (*init_guest)(struct guest_info * info);
   int (*start_guest)(struct guest_info * info);
   //  int (*stop_vm)(uint_t vm_id);
@@ -245,6 +265,8 @@ struct vmm_ctrl_ops {
 
 
 
+
+
 void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops);