X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=8114c7786b2a57c25e15c96f6f31548e45c7e04f;hb=e23a867d9dcecc70fc76adc0f89404dbc50e5b78;hp=26c5c5e512cff7ad0e2eec2cbff2132eda27c6f7;hpb=39849abeb743c4e6b669a790c307979fa8d51884;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 26c5c5e..8114c77 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -188,18 +188,9 @@
     } 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)							\
@@ -221,11 +212,14 @@
 
 
 // Maybe make this a define....
-typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU} v3_cpu_arch_t;
+typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU, V3_VMX_EPT_CPU} v3_cpu_arch_t;
 
 
 v3_cpu_mode_t v3_get_host_cpu_mode();
 
+void v3_yield(struct guest_info * info);
+void v3_yield_cond(struct guest_info * info);
+
 
 #endif //!__V3VEE__
 
@@ -260,9 +254,31 @@ 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);
 };
 
 
+
+typedef enum {NONE, HARDDRIVE, CDROM, VIRTIO} v3_disk_type_t;
+typedef enum {RAM, NETWORK} v3_disk_connection_t;
+
+union v3_disk_info {
+    struct {
+	void * data_ptr;
+	int size;
+    } ram;
+
+    struct {
+	char * ip_str;
+	int port;
+	char * disk_name;
+    } net;
+};
+
 struct v3_vm_config {
     void * rombios;
     int rombios_size;
@@ -274,17 +290,22 @@ struct v3_vm_config {
     // so we can specify maximum physical address size
     // (We're screwed if we want to do 32 bit host/64 bit guest)
 
-
     int enable_profiling;
     int enable_nested_paging;
 
     int enable_pci;
-    
-    int use_ram_cd;
-    int use_ram_hd;
 
-    void * ramdisk;
-    int ramdisk_size;
+    int enable_swap;
+
+    unsigned long schedule_freq; // in HZ
+
+    v3_disk_type_t pri_disk_type;
+    v3_disk_connection_t pri_disk_con;
+    union v3_disk_info pri_disk_info;
+   
+    v3_disk_type_t sec_disk_type;
+    v3_disk_connection_t sec_disk_con;
+    union v3_disk_info sec_disk_info;
 };
 
 
@@ -323,7 +344,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