X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=4640c01762c598c0c88b98355dfddb5586fc7072;hp=92ba2080abd9c2e3128b08f6e21b652bead0b2dd;hb=5a354421360c38d0f4d90f03c25296b2b35eec0e;hpb=794a794cec97cecc8c7de7f8b5fe33381a1e02e0 diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index 92ba208..4640c01 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -21,74 +21,52 @@ #define __VMM_H__ -#include +/*#include */ #include #include +struct guest_info; #ifdef __V3VEE__ -//#include +/*#include */ #include -//#include +/*#include */ /* 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; \ @@ -136,10 +114,11 @@ if ((os_hooks) && (os_hooks)->malloc) { \ var = (os_hooks)->malloc(size); \ } \ + if (!var) PrintError("MALLOC FAILURE. Memory LEAK!!\n"); \ var; \ }) -// We need to check the hook structure at runtime to ensure its SAFE +/* We need to check the hook structure at runtime to ensure its SAFE */ #define V3_Free(addr) \ do { \ extern struct v3_os_hooks * os_hooks; \ @@ -148,7 +127,7 @@ } \ } while (0) -// uint_t V3_CPU_KHZ(); +/* uint_t V3_CPU_KHZ(); */ #define V3_CPU_KHZ() ({ \ unsigned int khz = 0; \ extern struct v3_os_hooks * os_hooks; \ @@ -188,18 +167,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,19 +185,32 @@ -#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.... -typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU} v3_cpu_arch_t; +/* Maybe make this a define.... */ +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); +void v3_print_cond(const char * fmt, ...); + + +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); + -#endif //!__V3VEE__ +int v3_vm_enter(struct guest_info * info); + + +#endif /* !__V3VEE__ */ @@ -235,11 +218,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,69 +244,40 @@ struct v3_os_hooks { void (*mutex_free)(void * mutex); void (*mutex_lock)(void * mutex, int must_spin); void (*mutex_unlock)(void * mutex); -}; - - -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; - - int use_ram_cd; - int use_ram_hd; - int use_net_cd; - int use_net_hd; - - void * ramdisk; - int ramdisk_size; + 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)(); -}; -// -// -// This is the interrupt state that the VMM's interrupt handlers need to see -// +/* + * + * This is the interrupt state that the VMM's interrupt handlers need to see + */ struct v3_interrupt { unsigned int irq; unsigned int error; - unsigned int should_ack; // Should the vmm ack this interrupt, or will - // the host OS do it? + unsigned int should_ack; /* Should the vmm ack this interrupt, or will + * the host OS do it? + */ }; -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);