X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=ecad47f245be51efa7e6e70214486889248ca8c6;hb=82cceefa66b1f05d8f9d5bfcb2fb7214755e1904;hp=b9e3feabecc7565f53b7b39d40cdba001b86a21e;hpb=06535b05abbca1ada6c3fd3c32db475b97539070;p=palacios.git diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index b9e3fea..ecad47f 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -1,3 +1,22 @@ +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #ifndef __VMM_H #define __VMM_H @@ -28,6 +47,17 @@ #endif + +#define PrintError(fmt, args...) \ + do { \ + extern struct vmm_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->print_debug) { \ + (os_hooks)->print_debug("%s(%d): " fmt, __FILE__, __LINE__, ##args); \ + } \ + } while (0) + + + #if VMM_INFO #define PrintInfo(fmt, args...) \ do { \ @@ -42,38 +72,39 @@ #if VMM_TRACE -#define PrintTrace(fmt, args...) \ - do { \ - extern struct vmm_os_hooks * os_hooks; \ - if ((os_hooks) && (os_hooks)->print_trace) { \ - (os_hooks)->print_trace((fmt), ##args); \ - } \ +#define PrintTrace(fmt, args...) \ + do { \ + extern struct vmm_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(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; \ @@ -93,6 +124,8 @@ } \ } while (0) \ + +// uint_t V3_CPU_KHZ(); #define V3_CPU_KHZ() \ ({ \ unsigned int khz = 0; \ @@ -104,6 +137,29 @@ }) \ + +#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_Yield(addr) \ + do { \ + extern struct vmm_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->yield_cpu) { \ + (os_hooks)->yield_cpu(); \ + } \ + } while (0) \ + + + + + /* ** */ #define V3_ASSERT(x) \ @@ -117,31 +173,22 @@ } while(0) \ + + #define VMM_INVALID_CPU 0 #define VMM_VMX_CPU 1 #define VMM_SVM_CPU 2 -#endif //!__V3VEE__ +// 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; -// -// -// This is the interrupt state that the VMM's interrupt handlers need to see -// -struct vmm_intr_state { - uint_t irq; - uint_t error; - uint_t should_ack; // Should the vmm ack this interrupt, or will - // the host OS do it? +#endif //!__V3VEE__ - // This is the value given when the interrupt is hooked. - // This will never be NULL - void *opaque; -}; -void deliver_interrupt_to_vmm(struct vmm_intr_state *state); +struct guest_info; /* This will contain function pointers that provide OS services */ struct vmm_os_hooks { @@ -158,43 +205,68 @@ 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)(struct guest_info * vm, unsigned int irq); 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 (*yield_cpu)(); - void (*start_kernel_thread)(); // include pointer to function +}; + + +struct v3_vm_config { + void * vm_kernel; + int use_ramdisk; + void * ramdisk; + int ramdisk_size; }; /* 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, struct v3_vm_config * 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); +// +// +// 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? +}; + + +void Init_V3(struct vmm_os_hooks * hooks, struct vmm_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