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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index c209185..8114c77 100644
--- 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,18 +178,19 @@
 	    ret;							\
 	})								\
 	
-#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_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_ASSERT(x)							\
@@ -194,23 +204,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
@@ -219,7 +212,13 @@
 
 
 // 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__
@@ -246,27 +245,40 @@ 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);
+    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 *(*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;
@@ -278,12 +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 enable_swap;
 
-    int use_ramdisk;
-    void * ramdisk;
-    int ramdisk_size;
+    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;
 };
 
 
@@ -292,8 +314,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);
 
@@ -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