X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=f24b8e3718cb919a8e7855df2b540a1721bf0328;hb=36c1666cf64c49302d906a79d8cafbf760452d86;hp=878966f7669954507865738c8725903b09c2db40;hpb=4f0bb09709fcff0e08aef60c1f0253bbef91f608;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 878966f..f24b8e3 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -21,10 +21,11 @@
 #define __VMM_H__
 
 
-#include <palacios/vm_guest.h>
+//#include <palacios/vm_guest.h>
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
 
+struct guest_info;
 
 
 #ifdef __V3VEE__
@@ -113,6 +114,7 @@
 	    if ((os_hooks) && (os_hooks)->malloc) {	\
 		var = (os_hooks)->malloc(size);		\
 	    }						\
+	    if (!var) PrintError("MALLOC FAILURE. Memory LEAK!!\n");	\
 	    var;					\
 	})
 
@@ -146,11 +148,11 @@
     } while (0)
 
 
-#define V3_Hook_Interrupt(irq, opaque) ({				\
+#define V3_Hook_Interrupt(vm, irq) ({					\
 	    int ret = 0;						\
 	    extern struct v3_os_hooks * os_hooks;			\
 	    if ((os_hooks) && (os_hooks)->hook_interrupt) {		\
-		ret = (os_hooks)->hook_interrupt(irq, opaque);		\
+		ret = (os_hooks)->hook_interrupt(vm, irq);		\
 	    }								\
 	    ret;							\
 	})								\
@@ -183,9 +185,8 @@
 
 
 
-#define VMM_INVALID_CPU 0
-#define VMM_VMX_CPU 1
-#define VMM_SVM_CPU 2
+
+typedef enum v3_vm_class {V3_INVALID_VM, V3_PC_VM, V3_CRAY_VM} v3_vm_class_t;
 
 
 // Maybe make this a define....
@@ -196,13 +197,24 @@ v3_cpu_mode_t v3_get_host_cpu_mode();
 
 void v3_yield(struct guest_info * info);
 void v3_yield_cond(struct guest_info * info);
+void v3_print_cond(const char * fmt, ...);
+
+
+void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu);
+
+unsigned int v3_get_cpu_id();
+
+v3_cpu_arch_t v3_get_cpu_type(int cpu_id);
+
+
+int v3_vm_enter(struct guest_info * info);
 
 
 #endif //!__V3VEE__
 
 
 
-struct guest_info;
+struct v3_vm_info;
 
 /* This will contain function pointers that provide OS services */
 struct v3_os_hooks {
@@ -218,7 +230,7 @@ struct v3_os_hooks {
     void *(*paddr_to_vaddr)(void *addr);
     void *(*vaddr_to_paddr)(void *addr);
 
-    int (*hook_interrupt)(struct guest_info * vm, unsigned int irq);
+    int (*hook_interrupt)(struct v3_vm_info * vm, unsigned int irq);
 
     int (*ack_irq)(int irq);
 
@@ -232,64 +244,15 @@ struct v3_os_hooks {
     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;
+    unsigned int (*get_cpu)(void);
+    void (*interrupt_cpu)(struct v3_vm_info * vm, int logical_cpu);
+    void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg);
+    void (*start_thread_on_cpu)(int logical_cpu, int (*fn)(void * arg), void * arg, char * thread_name);
 };
 
-struct v3_vm_config {
 
-    unsigned long mem_size; // in bytes, var should be natural size of cpu
-    // 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;
-
-    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;
-};
-
-
-
-/* This will contain Function pointers that control the VMs */
-struct v3_ctrl_ops {
-    struct guest_info *(*allocate_guest)(void);
-
-    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);
-
-    int (*has_nested_paging)(void);
-
-    //  v3_cpu_arch_t (*get_cpu_arch)();
-};
 
 
 
@@ -309,9 +272,13 @@ struct v3_interrupt {
 
 
 
-void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops);
+void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
+
+
+int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask);
+struct v3_vm_info * v3_create_vm(void * cfg);
 
-int v3_deliver_irq(struct guest_info * vm, struct v3_interrupt * intr);
+int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);