X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=2da7ee26f7b8294304d7a7bea3efeec7d01cc327;hb=52e81251f82ccaf516e3ed626c8abbcc9fbe3f41;hp=d5f8fea909d05843223ae9ba05fb35300a244d3a;hpb=e63caa4c57933b3b38f498fea015785f8869c5ef;p=palacios.git diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index d5f8fea..2da7ee2 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -38,57 +38,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; \ @@ -160,6 +137,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 +155,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) \ @@ -202,7 +189,16 @@ // 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); + + +void v3_interrupt_cpu(struct guest_info * vm, int logical_cpu); #endif //!__V3VEE__ @@ -213,11 +209,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); @@ -229,42 +221,64 @@ 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); + void (*interrupt_cpu)(struct guest_info * vm, int logical_cpu); 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); + 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; -struct v3_vm_config { - void * rombios; - int rombios_size; +union v3_disk_info { + struct { + void * data_ptr; + int size; + } ram; - void * vgabios; - int vgabios_size; + struct { + char * ip_str; + int port; + char * disk_name; + } net; +}; + +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_telemetry; + int enable_nested_paging; - int enable_profiling; + int enable_pci; - int use_ramdisk; - 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; }; @@ -273,8 +287,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); @@ -304,7 +317,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