X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=87d50edbbb48143bed1defcb30b84d09b33943ff;hp=42c98c5ef5df4997618d155d94157b8083357649;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=1f5b9287e61b8a4164f81e52dccf3ddd59a891f8 diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index 42c98c5..87d50ed 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -21,10 +21,11 @@ #define __VMM_H__ -#include +//#include #include #include +struct guest_info; #ifdef __V3VEE__ @@ -38,57 +39,34 @@ /* utility definitions */ +#define V3_Print(fmt, args...) \ + do { \ + extern struct v3_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->print) { \ + (os_hooks)->print((fmt), ##args); \ + } \ + } while (0) + + #define PrintDebug(fmt, args...) \ do { \ extern struct v3_os_hooks * os_hooks; \ - if ((os_hooks) && (os_hooks)->print_debug) { \ - (os_hooks)->print_debug((fmt), ##args); \ + if ((os_hooks) && (os_hooks)->print) { \ + (os_hooks)->print((fmt), ##args); \ } \ } while (0) -#if 1 -#else -#define PrintDebug(fmt,args ...) -#endif - - #define PrintError(fmt, args...) \ do { \ extern struct v3_os_hooks * os_hooks; \ - if ((os_hooks) && (os_hooks)->print_debug) { \ - (os_hooks)->print_debug("%s(%d): " fmt, __FILE__, __LINE__, ##args); \ + if ((os_hooks) && (os_hooks)->print) { \ + (os_hooks)->print("%s(%d): " fmt, __FILE__, __LINE__, ##args); \ } \ } while (0) -#ifdef VMM_INFO -#define PrintInfo(fmt, args...) \ - do { \ - extern struct v3_os_hooks * os_hooks; \ - if ((os_hooks) && (os_hooks)->print_info) { \ - (os_hooks)->print_info((fmt), ##args); \ - } \ - } while (0) -#else -#define PrintInfo(fmt, args...) -#endif - - -#ifdef VMM_TRACE -#define PrintTrace(fmt, args...) \ - do { \ - extern struct v3_os_hooks * os_hooks; \ - if ((os_hooks) && (os_hooks)->print_trace) { \ - (os_hooks)->print_trace(fmt, ##args); \ - } \ - } while (0) -#else -#define PrintTrace(fmt, args...) -#endif - - #define V3_AllocPages(num_pages) \ ({ \ extern struct v3_os_hooks * os_hooks; \ @@ -188,18 +166,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) \ @@ -215,9 +184,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.... @@ -226,6 +194,19 @@ typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CP 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_interrupt_cpu(struct guest_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__ @@ -235,11 +216,7 @@ struct guest_info; /* This will contain function pointers that provide OS services */ struct v3_os_hooks { - void (*print_info)(const char * format, ...) - __attribute__ ((format (printf, 1, 2))); - void (*print_debug)(const char * format, ...) - __attribute__ ((format (printf, 1, 2))); - void (*print_trace)(const char * format, ...) + void (*print)(const char * format, ...) __attribute__ ((format (printf, 1, 2))); void *(*allocate_pages)(int numPages); @@ -265,65 +242,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} 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; - - void * vgabios; - int vgabios_size; - - 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; - - 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; + unsigned int (*get_cpu)(void); + void (*interrupt_cpu)(struct guest_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); }; -/* 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)(); -}; @@ -343,7 +270,11 @@ 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 guest_info * info, unsigned int cpu_mask); +struct guest_info * v3_create_vm(void * cfg); int v3_deliver_irq(struct guest_info * vm, struct v3_interrupt * intr);