added locking primitives

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 5982a3a..92ba208 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -178,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;           \
@@ -214,6 +224,9 @@
 typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU} v3_cpu_arch_t;
 
 
+v3_cpu_mode_t v3_get_host_cpu_mode();
+
+
 #endif //!__V3VEE__
 
 
@@ -247,6 +260,11 @@ struct v3_os_hooks {
     void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
 
     void (*yield_cpu)(void); 
+
+    void *(*mutex_alloc)(void);
+    void (*mutex_free)(void * mutex);
+    void (*mutex_lock)(void * mutex, int must_spin);
+    void (*mutex_unlock)(void * mutex);
 };
 
 
@@ -263,8 +281,15 @@ struct v3_vm_config {
 
 
     int enable_profiling;
+    int enable_nested_paging;
+
+    int enable_pci;
+    
+    int use_ram_cd;
+    int use_ram_hd;
+    int use_net_cd;
+    int use_net_hd;
 
-    int use_ramdisk;
     void * ramdisk;
     int ramdisk_size;
 };
@@ -275,8 +300,7 @@ struct v3_vm_config {
 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 (*init_guest)(struct guest_info * info, struct v3_vm_config * config_ptr);
     int (*start_guest)(struct guest_info * info);
     //  int (*stop_vm)(uint_t vm_id);
 
@@ -306,7 +330,7 @@ struct v3_interrupt {
 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