X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=ad139e8ad892ce77267985b46917d5c4e3338f26;hb=b84c13ec0315404c6b6de8c1d3a7a65ac766a782;hp=737ec359c5fe985a89ec832311182fa96c8b7281;hpb=f4b074d9bf5c28dfd6e5fd616805ade2e9473b01;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 737ec35..ad139e8 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -1,5 +1,21 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #ifndef __VMM_H
 #define __VMM_H
@@ -32,12 +48,12 @@
 
 
 
-#define PrintError(fmt, args...)			\
-  do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
-    if ((os_hooks) && (os_hooks)->print_debug) {	\
-      (os_hooks)->print_debug((fmt), ##args);		\
-    }							\
+#define PrintError(fmt, args...)					\
+  do {									\
+    extern struct vmm_os_hooks * os_hooks;				\
+    if ((os_hooks) && (os_hooks)->print_debug) {			\
+      (os_hooks)->print_debug("%s(%d): " fmt, __FILE__, __LINE__, ##args); \
+    }									\
   } while (0)						
 
 
@@ -56,12 +72,12 @@
 
 
 #if VMM_TRACE
-#define PrintTrace(fmt, args...)			\
-  do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
-    if ((os_hooks) && (os_hooks)->print_trace) {	\
-      (os_hooks)->print_trace((fmt), ##args);		\
-    }							\
+#define PrintTrace(fmt, args...)					\
+  do {									\
+    extern struct vmm_os_hooks * os_hooks;				\
+    if ((os_hooks) && (os_hooks)->print_trace) {			\
+      (os_hooks)->print_trace(fmt, ##args);				\
+    }									\
   } while (0)						
 #else
 #define PrintTrace(fmt, args...)
@@ -132,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)						\
+
+
+
+
 
 /* ** */
 
@@ -161,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 {
@@ -197,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);
 
@@ -207,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);
@@ -229,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);
+
 
 
 #endif