renamed guest cpu/mem mode functions

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 8718f2f..26c5c5e 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -160,11 +160,11 @@
        
 
 
-#define V3_CREATE_THREAD(fn, name)                             \
+#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, name);          \
+           (os_hooks)->start_kernel_thread(fn, arg, name);     \
        }                                                       \
     } while (0)
 
@@ -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__
 
 
@@ -244,7 +257,7 @@ struct v3_os_hooks {
 
     unsigned int (*get_cpu_khz)(void);
 
-    void (*start_kernel_thread)(int (*fn)(void * arg), char * thread_name); 
+    void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
 
     void (*yield_cpu)(void); 
 };
@@ -263,8 +276,13 @@ struct v3_vm_config {
 
 
     int enable_profiling;
+    int enable_nested_paging;
+
+    int enable_pci;
+    
+    int use_ram_cd;
+    int use_ram_hd;
 
-    int use_ramdisk;
     void * ramdisk;
     int ramdisk_size;
 };
@@ -275,8 +293,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);