X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=4a4ed79f8e8130061dcaa7f7ef6049d9972e04e4;hb=1fe82881720f7f9f64f789871f763aca93b47a7e;hp=b72c2fef31f5fd708207312d10984c81b0a1ac85;hpb=dae94a7be8e57506533a2583394d1fe4ae07e74b;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index b72c2fe..4a4ed79 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -17,12 +17,15 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VMM_H
-#define __VMM_H
+#ifndef __VMM_H__
+#define __VMM_H__
 
 
 #include <palacios/vm_guest.h>
 #include <palacios/vmm_mem.h>
+#include <palacios/vmm_types.h>
+
+
 
 #ifdef __V3VEE__
 
@@ -34,14 +37,16 @@
 
 /* utility definitions */
 
-#if VMM_DEBUG
+
 #define PrintDebug(fmt, args...)			\
-  do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
-    if ((os_hooks) && (os_hooks)->print_debug) {	\
-      (os_hooks)->print_debug((fmt), ##args);		\
-    }							\
-  } while (0)						
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->print_debug) {	\
+	    (os_hooks)->print_debug((fmt), ##args);	\
+	}						\
+    } while (0)						
+
+#if 1
 #else
 #define PrintDebug(fmt,args ...)
 #endif
@@ -49,129 +54,164 @@
 
 
 #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)						
+    do {								\
+	extern struct v3_os_hooks * os_hooks;				\
+	if ((os_hooks) && (os_hooks)->print_debug) {			\
+	    (os_hooks)->print_debug("%s(%d): " fmt, __FILE__, __LINE__, ##args); \
+	}								\
+    } while (0)						
 
 
 
-#if VMM_INFO
+#ifdef VMM_INFO
 #define PrintInfo(fmt, args...) 		        \
-  do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
-    if ((os_hooks) && (os_hooks)->print_info) {		\
-      (os_hooks)->print_info((fmt), ##args);		\
-    }							\
-  } while (0)						
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->print_info) {	\
+	    (os_hooks)->print_info((fmt), ##args);	\
+	}						\
+    } while (0)						
 #else
 #define PrintInfo(fmt, args...)
 #endif
 
 
-#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);				\
-    }									\
-  } while (0)						
+#ifdef VMM_TRACE
+#define PrintTrace(fmt, args...)			\
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->print_trace) {	\
+	    (os_hooks)->print_trace(fmt, ##args);	\
+	}						\
+    } while (0)						
 #else
 #define PrintTrace(fmt, args...)
 #endif
 
 
-#define V3_AllocPages(num_pages)		        \
-  ({							\
-    extern struct vmm_os_hooks * os_hooks;		\
-    void * ptr = 0;					\
-    if ((os_hooks) && (os_hooks)->allocate_pages) {	\
-      ptr = (os_hooks)->allocate_pages(num_pages);	\
-    }							\
-    ptr;						\
-  })							\
-
-
-#define V3_FreePage(page)			\
-  do {						\
-    extern struct vmm_os_hooks * os_hooks;	\
-    if ((os_hooks) && (os_hooks)->free_page) {	\
-      (os_hooks)->free_page(page);		\
-    }						\
-  } while(0)					\
+#define V3_AllocPages(num_pages)				\
+    ({								\
+	extern struct v3_os_hooks * os_hooks;			\
+	void * ptr = 0;						\
+	if ((os_hooks) && (os_hooks)->allocate_pages) {		\
+	    ptr = (os_hooks)->allocate_pages(num_pages);	\
+	}							\
+	ptr;							\
+    })
 
 
+#define V3_FreePage(page)				\
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->free_page) {	\
+	    (os_hooks)->free_page(page);		\
+	}						\
+    } while(0)
 
 
-#define V3_Malloc(size) ({			\
-      extern struct vmm_os_hooks * os_hooks;	\
-      void * var = 0;				\
-      if ((os_hooks) && (os_hooks)->malloc) {	\
-	var = (os_hooks)->malloc(size);		\
-      }						\
-      var;					\
-    })
+#define V3_VAddr(addr) ({					\
+	    extern struct v3_os_hooks * os_hooks;		\
+	    void * var = 0;					\
+	    if ((os_hooks) && (os_hooks)->paddr_to_vaddr) {	\
+		var = (os_hooks)->paddr_to_vaddr(addr);		\
+	    }							\
+	    var;						\
+	})
 
-// We need to check the hook structure at runtime to ensure its SAFE
-#define V3_Free(addr)					\
-  do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
-    if ((os_hooks) && (os_hooks)->free) {		\
-      (os_hooks)->free(addr);				\
-    }							\
-  } while (0)						\
 
+#define V3_PAddr(addr) ({					\
+	    extern struct v3_os_hooks * os_hooks;		\
+	    void * var = 0;					\
+	    if ((os_hooks) && (os_hooks)->vaddr_to_paddr) {	\
+		var = (os_hooks)->vaddr_to_paddr(addr);		\
+	    }							\
+	    var;						\
+	})
 
-// uint_t V3_CPU_KHZ();
-#define V3_CPU_KHZ()					\
-  ({ 							\
-    unsigned int khz = 0;				\
-    extern struct vmm_os_hooks * os_hooks;		\
-    if ((os_hooks) && (os_hooks)->get_cpu_khz) {	\
-      khz = (os_hooks)->get_cpu_khz();			\
-    }							\
-    khz;						\
-  })							\
-    
-
-
-#define V3_Hook_Interrupt(irq, opaque)				\
-  ({								\
-    int ret = 0;						\
-    extern struct vmm_os_hooks * os_hooks;			\
-    if ((os_hooks) && (os_hooks)->hook_interrupt) {		\
-      ret = (os_hooks)->hook_interrupt(irq, opaque);		\
-    }								\
-    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)						\
 
+#define V3_Malloc(size) ({				\
+	    extern struct v3_os_hooks * os_hooks;	\
+	    void * var = 0;				\
+	    if ((os_hooks) && (os_hooks)->malloc) {	\
+		var = (os_hooks)->malloc(size);		\
+	    }						\
+	    var;					\
+	})
 
+// We need to check the hook structure at runtime to ensure its SAFE
+#define V3_Free(addr)				\
+    do {					\
+	extern struct v3_os_hooks * os_hooks;	\
+	if ((os_hooks) && (os_hooks)->free) {	\
+	    (os_hooks)->free(addr);		\
+	}					\
+    } while (0)
 
+// uint_t V3_CPU_KHZ();
+#define V3_CPU_KHZ() ({							\
+	    unsigned int khz = 0;					\
+	    extern struct v3_os_hooks * os_hooks;			\
+	    if ((os_hooks) && (os_hooks)->get_cpu_khz) {		\
+		khz = (os_hooks)->get_cpu_khz();			\
+	    }								\
+	    khz;							\
+	})								\
+	
+
+
+#define V3_CREATE_THREAD(fn, arg, name)				\
+    do {							\
+	extern struct v3_os_hooks * os_hooks;			\
+	if ((os_hooks) && (os_hooks)->start_kernel_thread) {	\
+	    (os_hooks)->start_kernel_thread(fn, arg, name);	\
+	}							\
+    } while (0)
+
+
+#define V3_Hook_Interrupt(irq, opaque) ({				\
+	    int ret = 0;						\
+	    extern struct v3_os_hooks * os_hooks;			\
+	    if ((os_hooks) && (os_hooks)->hook_interrupt) {		\
+		ret = (os_hooks)->hook_interrupt(irq, opaque);		\
+	    }								\
+	    ret;							\
+	})								\
+	
+
+#define V3_ACK_IRQ(irq)						\
+    do {							\
+	extern struct v3_os_hooks * os_hooks;			\
+	if ((os_hooks) && (os_hooks)->ack_irq) {		\
+	    (os_hooks)->ack_irq(irq);				\
+	}							\
+    } while (0)
 
 
+#define V3_Yield(addr)					\
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->yield_cpu) {	\
+	    (os_hooks)->yield_cpu();			\
+	}						\
+    } while (0)						\
+							\
+							\
+							\
+							\
+							\
 /* ** */
 
 #define V3_ASSERT(x)							\
-  do {									\
-    if (!(x)) {							 	\
-      PrintDebug("Failed assertion in %s: %s at %s, line %d, RA=%lx\n",	\
-		 __func__, #x, __FILE__, __LINE__,			\
-		 (ulong_t) __builtin_return_address(0));                \
-      while(1);								\
-    }									\
-  } while(0)								\
-    
+    do {								\
+	if (!(x)) {							\
+	    PrintDebug("Failed assertion in %s: %s at %s, line %d, RA=%lx\n", \
+		       __func__, #x, __FILE__, __LINE__,		\
+		       (ulong_t) __builtin_return_address(0));		\
+	    while(1);							\
+	}								\
+    } while(0)								\
+	
 
 
 
@@ -188,87 +228,96 @@ 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 {
-  void (*print_info)(const char * format, ...);
-  void (*print_debug)(const char * format, ...);
-  void (*print_trace)(const char * format, ...);
+struct v3_os_hooks {
+    void (*print_info)(const char * format, ...)
+  	__attribute__ ((format (printf, 1, 2)));
+    void (*print_debug)(const char * format, ...)
+  	__attribute__ ((format (printf, 1, 2)));
+    void (*print_trace)(const char * format, ...)
+  	__attribute__ ((format (printf, 1, 2)));
   
-  void *(*allocate_pages)(int numPages);
-  void (*free_page)(void * page);
+    void *(*allocate_pages)(int numPages);
+    void (*free_page)(void * page);
 
-  void *(*malloc)(unsigned int size);
-  void (*free)(void * addr);
+    void *(*malloc)(unsigned int size);
+    void (*free)(void * addr);
 
-  void *(*paddr_to_vaddr)(void *addr);
-  void *(*vaddr_to_paddr)(void *addr);
+    void *(*paddr_to_vaddr)(void *addr);
+    void *(*vaddr_to_paddr)(void *addr);
 
-  //  int (*hook_interrupt)(struct guest_info *s, int irq);
+    int (*hook_interrupt)(struct guest_info * vm, unsigned int irq);
 
-  int (*hook_interrupt)(unsigned int irq, void *opaque);
+    int (*ack_irq)(int irq);
 
-  int (*ack_irq)(int irq);
+    unsigned int (*get_cpu_khz)(void);
 
+    void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
 
-  unsigned int (*get_cpu_khz)();
+    void (*yield_cpu)(void); 
+};
 
 
-  void (*start_kernel_thread)(); // include pointer to function
+struct v3_vm_config {
+    void * rombios;
+    int rombios_size;
 
-  void (*yield_cpu)();
+    void * vgabios;
+    int vgabios_size;
 
-};
+    unsigned long mem_size; // in bytes, var should be natural size of cpu
+    // so we can specify maximum physical address size
+    // (We're screwed if we want to do 32 bit host/64 bit guest)
 
 
-struct v3_vm_config {
-  void * vm_kernel;
-  int use_ramdisk;
-  void * ramdisk;
-  int ramdisk_size;
+    int enable_profiling;
+    int enable_nested_paging;
+
+    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)();
+struct v3_ctrl_ops {
+    struct guest_info *(*allocate_guest)(void);
 
-  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);
+    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);
 
-  int (*has_nested_paging)();
+    int (*has_nested_paging)(void);
 
-  //  v3_cpu_arch_t (*get_cpu_arch)();
+    //  v3_cpu_arch_t (*get_cpu_arch)();
 };
 
 
 
 
-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 v3_os_hooks * hooks, struct v3_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