X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=977cd0d253e00da47bd98360e2136d58235799bb;hb=f9bb3db89469169bb5775dc031d89e570c6fed70;hp=aebc8adca9844d2c01424523f5fc925afa7cab9f;hpb=cbf35ad72de3a7a1f6eee3e8b2b35d7f31df22a5;p=palacios.git diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index aebc8ad..977cd0d 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -1,3 +1,6 @@ +/* Northwestern University */ +/* (c) 2008, Jack Lange */ + #ifndef __VMM_H #define __VMM_H @@ -65,26 +68,27 @@ #endif -#define V3_AllocPages(ptr, num_pages) \ - do { \ +#define V3_AllocPages(num_pages) \ + ({ \ extern struct vmm_os_hooks * os_hooks; \ - ptr = 0; \ + void * ptr = 0; \ if ((os_hooks) && (os_hooks)->allocate_pages) { \ ptr = (os_hooks)->allocate_pages(num_pages); \ } \ - } while (0) \ + ptr; \ + }) \ + + +#define V3_FreePage(page) \ + do { \ + extern struct vmm_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->free_page) { \ + (os_hooks)->free_page(page); \ + } \ + } while(0) \ + -/* -#define V3_Malloc(type, var, size) \ - do { \ - extern struct vmm_os_hooks * os_hooks; \ - var = 0; \ - if ((os_hooks) && (os_hooks)->malloc) { \ - var = (type)(os_hooks)->malloc(size); \ - } \ - } while (0) \ -*/ #define V3_Malloc(size) ({ \ extern struct vmm_os_hooks * os_hooks; \ @@ -104,6 +108,8 @@ } \ } while (0) \ + +// uint_t V3_CPU_KHZ(); #define V3_CPU_KHZ() \ ({ \ unsigned int khz = 0; \ @@ -115,6 +121,18 @@ }) \ + +#define V3_Hook_Interrupt(irq, opaque) \ + ({ \ + int ret = 0; \ + extern struct vmm_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->hook_interrupt) { \ + ret = (os_hooks)->hook_interrupt(irq, opaque); \ + } \ + ret; \ + }) \ + + /* ** */ #define V3_ASSERT(x) \ @@ -128,22 +146,30 @@ } while(0) \ + + #define VMM_INVALID_CPU 0 #define VMM_VMX_CPU 1 #define VMM_SVM_CPU 2 + +// 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; + + #endif //!__V3VEE__ + // // // This is the interrupt state that the VMM's interrupt handlers need to see // struct vmm_intr_state { - uint_t irq; - uint_t error; + unsigned int irq; + unsigned int error; - uint_t should_ack; // Should the vmm ack this interrupt, or will + unsigned int should_ack; // Should the vmm ack this interrupt, or will // the host OS do it? // This is the value given when the interrupt is hooked. @@ -169,40 +195,41 @@ struct vmm_os_hooks { void *(*paddr_to_vaddr)(void *addr); void *(*vaddr_to_paddr)(void *addr); - // int (*hook_interrupt)(int irq, vmm_intr_handler handler, uint_t opaque); + // int (*hook_interrupt)(struct guest_info *s, int irq); - int (*hook_interrupt)(struct guest_info *s, int irq); - - int (*hook_interrupt_new)(uint_t irq, void *opaque); + int (*hook_interrupt)(unsigned int irq, void *opaque); int (*ack_irq)(int irq); unsigned int (*get_cpu_khz)(); - // Do we need this here? - // void (*snprintf)(char * dst, char * format, int len, ...); + void (*start_kernel_thread)(); // include pointer to function - void (*start_kernel_thread)(); // include pointer to function -}; +}; /* This will contain Function pointers that control the VMs */ struct vmm_ctrl_ops { - int (*init_guest)(struct guest_info* info); + struct guest_info *(*allocate_guest)(); + + int (*config_guest)(struct guest_info * info, void * config_ptr); + int (*init_guest)(struct guest_info * info); int (*start_guest)(struct guest_info * info); // int (*stop_vm)(uint_t vm_id); int (*has_nested_paging)(); + + // v3_cpu_arch_t (*get_cpu_arch)(); }; -void Init_VMM(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops); +void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops);