X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=ecad47f245be51efa7e6e70214486889248ca8c6;hb=101b1bdfedbf377765d7c74641e9bcf356ebed18;hp=b8728b4ff2bc46a0ac694e663ad1f1a49bd1bee2;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index b8728b4..ecad47f 100644
--- 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)						\
+
+
+
+
 
 /* ** */
 
@@ -177,24 +188,7 @@ typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CP
 
 
 
-//
-//
-// This is the interrupt state that the VMM's interrupt handlers need to see
-//
-struct vmm_intr_state {
-  unsigned int irq;
-  unsigned int error;
-
-  unsigned int should_ack;  // Should the vmm ack this interrupt, or will
-                      // the host OS do it?
-
-  // This is the value given when the interrupt is hooked.
-  // This will never be NULL
-  void * opaque;
-};
-
-void deliver_interrupt_to_vmm(struct vmm_intr_state * state);
-
+struct guest_info;
 
 /* This will contain function pointers that provide OS services */
 struct vmm_os_hooks {
@@ -213,7 +207,7 @@ struct vmm_os_hooks {
 
   //  int (*hook_interrupt)(struct guest_info *s, int irq);
 
-  int (*hook_interrupt)(unsigned int irq, void *opaque);
+  int (*hook_interrupt)(struct guest_info * vm, unsigned int irq);
 
   int (*ack_irq)(int irq);
 
@@ -223,16 +217,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,10 +248,25 @@ struct vmm_ctrl_ops {
 
 
 
-void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops);
+//
+//
+// This is the interrupt state that the VMM's interrupt handlers need to see
+//
+struct v3_interrupt {
+  unsigned int irq;
+  unsigned int error;
 
+  unsigned int should_ack;  // Should the vmm ack this interrupt, or will
+                      // the host OS do it?
+};
 
 
 
 
+void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops);
+
+int v3_deliver_irq(struct guest_info * vm, struct v3_interrupt * intr);
+int v3_deliver_keyboard_evt(struct guest_info * vm);
+
+
 #endif