first cut at nested paging

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index c209185..4a4ed79 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -24,7 +24,7 @@
 #include <palacios/vm_guest.h>
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
-#include <devices/vnic.h>
+
 
 
 #ifdef __V3VEE__
@@ -160,6 +160,15 @@
        
 
 
+#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;                       \
@@ -169,6 +178,16 @@
            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;           \
@@ -194,23 +213,6 @@
     } while(0)                                                         \
        
 
-#define V3_REGISTER_PKT_DELIVERY(x) ({                                 \
-           int ret = 0;                                                \
-           extern struct v3_os_hooks * os_hooks;                       \
-           if ((os_hooks) && (os_hooks)->register_pkt_delivery) {      \
-               ret = (os_hooks)->register_pkt_delivery(x);             \
-           }                                                           \
-           ret;                                                        \
-       })
-
-#define V3_SEND_PKT(x, y) ({                                   \
-           int ret = 0;                                        \
-           extern struct v3_os_hooks * os_hooks;               \
-           if ((os_hooks) && (os_hooks)->ne2k_send_packet) {   \
-               ret = (os_hooks)->ne2k_send_packet(x, y);       \
-           }                                                   \
-           ret;                                                \
-       })
 
 
 #define VMM_INVALID_CPU 0
@@ -246,24 +248,15 @@ struct v3_os_hooks {
     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 (*ack_irq)(int irq);
 
-
     unsigned int (*get_cpu_khz)(void);
 
+    void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
 
-    void (*start_kernel_thread)(void); // include pointer to function
-
-    void (*yield_cpu)(void);
-
-    //function by network card driver
-    int (*register_pkt_delivery)(int (*rcvd_fn)(uchar_t *packet, uint_t size));
-    int (*ne2k_send_packet)(uchar_t *packet, uint_t size);
- 
+    void (*yield_cpu)(void); 
 };
 
 
@@ -280,6 +273,7 @@ struct v3_vm_config {
 
 
     int enable_profiling;
+    int enable_nested_paging;
 
     int use_ramdisk;
     void * ramdisk;