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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index ad139e8..4708cc1 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -17,8 +17,8 @@
  * 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>
@@ -34,10 +34,10 @@
 
 /* utility definitions */
 
-#if VMM_DEBUG
+#ifdef VMM_DEBUG
 #define PrintDebug(fmt, args...)			\
   do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
+    extern struct v3_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->print_debug) {	\
       (os_hooks)->print_debug((fmt), ##args);		\
     }							\
@@ -50,7 +50,7 @@
 
 #define PrintError(fmt, args...)					\
   do {									\
-    extern struct vmm_os_hooks * os_hooks;				\
+    extern struct v3_os_hooks * os_hooks;				\
     if ((os_hooks) && (os_hooks)->print_debug) {			\
       (os_hooks)->print_debug("%s(%d): " fmt, __FILE__, __LINE__, ##args); \
     }									\
@@ -58,10 +58,10 @@
 
 
 
-#if VMM_INFO
+#ifdef VMM_INFO
 #define PrintInfo(fmt, args...) 		        \
   do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
+    extern struct v3_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->print_info) {		\
       (os_hooks)->print_info((fmt), ##args);		\
     }							\
@@ -71,10 +71,10 @@
 #endif
 
 
-#if VMM_TRACE
+#ifdef VMM_TRACE
 #define PrintTrace(fmt, args...)					\
   do {									\
-    extern struct vmm_os_hooks * os_hooks;				\
+    extern struct v3_os_hooks * os_hooks;				\
     if ((os_hooks) && (os_hooks)->print_trace) {			\
       (os_hooks)->print_trace(fmt, ##args);				\
     }									\
@@ -86,7 +86,7 @@
 
 #define V3_AllocPages(num_pages)		        \
   ({							\
-    extern struct vmm_os_hooks * os_hooks;		\
+    extern struct v3_os_hooks * os_hooks;		\
     void * ptr = 0;					\
     if ((os_hooks) && (os_hooks)->allocate_pages) {	\
       ptr = (os_hooks)->allocate_pages(num_pages);	\
@@ -97,7 +97,7 @@
 
 #define V3_FreePage(page)			\
   do {						\
-    extern struct vmm_os_hooks * os_hooks;	\
+    extern struct v3_os_hooks * os_hooks;	\
     if ((os_hooks) && (os_hooks)->free_page) {	\
       (os_hooks)->free_page(page);		\
     }						\
@@ -107,7 +107,7 @@
 
 
 #define V3_Malloc(size) ({			\
-      extern struct vmm_os_hooks * os_hooks;	\
+      extern struct v3_os_hooks * os_hooks;	\
       void * var = 0;				\
       if ((os_hooks) && (os_hooks)->malloc) {	\
 	var = (os_hooks)->malloc(size);		\
@@ -118,7 +118,7 @@
 // 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;		\
+    extern struct v3_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->free) {		\
       (os_hooks)->free(addr);				\
     }							\
@@ -129,7 +129,7 @@
 #define V3_CPU_KHZ()					\
   ({ 							\
     unsigned int khz = 0;				\
-    extern struct vmm_os_hooks * os_hooks;		\
+    extern struct v3_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->get_cpu_khz) {	\
       khz = (os_hooks)->get_cpu_khz();			\
     }							\
@@ -141,7 +141,7 @@
 #define V3_Hook_Interrupt(irq, opaque)				\
   ({								\
     int ret = 0;						\
-    extern struct vmm_os_hooks * os_hooks;			\
+    extern struct v3_os_hooks * os_hooks;			\
     if ((os_hooks) && (os_hooks)->hook_interrupt) {		\
       ret = (os_hooks)->hook_interrupt(irq, opaque);		\
     }								\
@@ -150,7 +150,7 @@
 
 #define V3_Yield(addr)					\
   do {							\
-    extern struct vmm_os_hooks * os_hooks;		\
+    extern struct v3_os_hooks * os_hooks;		\
     if ((os_hooks) && (os_hooks)->yield_cpu) {		\
       (os_hooks)->yield_cpu();				\
     }							\
@@ -191,7 +191,7 @@ typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CP
 struct guest_info;
 
 /* This will contain function pointers that provide OS services */
-struct vmm_os_hooks {
+struct v3_os_hooks {
   void (*print_info)(const char * format, ...);
   void (*print_debug)(const char * format, ...);
   void (*print_trace)(const char * format, ...);
@@ -212,12 +212,12 @@ struct vmm_os_hooks {
   int (*ack_irq)(int irq);
 
 
-  unsigned int (*get_cpu_khz)();
+  unsigned int (*get_cpu_khz)(void);
 
 
-  void (*start_kernel_thread)(); // include pointer to function
+  void (*start_kernel_thread)(void); // include pointer to function
 
-  void (*yield_cpu)();
+  void (*yield_cpu)(void);
 
 };
 
@@ -232,15 +232,15 @@ struct v3_vm_config {
 
 
 /* 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 (*has_nested_paging)();
+  int (*has_nested_paging)(void);
 
   //  v3_cpu_arch_t (*get_cpu_arch)();
 };
@@ -263,10 +263,10 @@ struct v3_interrupt {
 
 
 
-void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops);
+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