X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=f7a612d73069d65cff71a2e8e43c279d9cba20c3;hb=8f73ff87ab96b79b87854a2135c16b81cff879a3;hp=8e64a0453934e00f1a7a2ceb861f5202924536ae;hpb=bc2c46a12649344d973e2201271c05390ce924bf;p=palacios.git diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index 8e64a04..f7a612d 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -1,5 +1,24 @@ -#ifndef __VMM_H -#define __VMM_H +/* + * 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__ #include @@ -15,10 +34,10 @@ /* utility definitions */ -#if VMM_DEBUG +#ifdef VMM_DEBUG #define PrintDebug(fmt, args...) \ do { \ - extern struct vmm_os_hooks * os_hooks; \ + extern struct v3_os_hooks * os_hooks; \ if ((os_hooks) && (os_hooks)->print_debug) { \ (os_hooks)->print_debug((fmt), ##args); \ } \ @@ -29,20 +48,20 @@ -#define PrintError(fmt, args...) \ - do { \ - extern struct vmm_os_hooks * os_hooks; \ - if ((os_hooks) && (os_hooks)->print_debug) { \ - (os_hooks)->print_debug((fmt), ##args); \ - } \ +#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); \ + } \ } while (0) -#if VMM_INFO +#ifdef VMM_INFO #define PrintInfo(fmt, args...) \ do { \ - extern struct vmm_os_hooks * os_hooks; \ + extern struct v3_os_hooks * os_hooks; \ if ((os_hooks) && (os_hooks)->print_info) { \ (os_hooks)->print_info((fmt), ##args); \ } \ @@ -52,42 +71,62 @@ #endif -#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); \ - } \ +#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(ptr, num_pages) \ - do { \ - extern struct vmm_os_hooks * os_hooks; \ - ptr = 0; \ +#define V3_AllocPages(num_pages) \ + ({ \ + extern struct v3_os_hooks * os_hooks; \ + 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; \ + extern struct v3_os_hooks * os_hooks; \ if ((os_hooks) && (os_hooks)->free_page) { \ (os_hooks)->free_page(page); \ } \ } while(0) \ +#define V3_VAddr(addr) ({ \ + extern struct v3_os_hooks * os_hooks; \ + void * var = 0; \ + if ((os_hooks) && (os_hooks)->paddr_to_vaddr) { \ + var = (os_hooks)->paddr_to_vaddr(addr); \ + } \ + var; \ + }) + + +#define V3_PAddr(addr) ({ \ + extern struct v3_os_hooks * os_hooks; \ + void * var = 0; \ + if ((os_hooks) && (os_hooks)->vaddr_to_paddr) { \ + var = (os_hooks)->vaddr_to_paddr(addr); \ + } \ + var; \ + }) + #define V3_Malloc(size) ({ \ - extern struct vmm_os_hooks * os_hooks; \ + extern struct v3_os_hooks * os_hooks; \ void * var = 0; \ if ((os_hooks) && (os_hooks)->malloc) { \ var = (os_hooks)->malloc(size); \ @@ -98,7 +137,7 @@ // We need to check the hook structure at runtime to ensure its SAFE #define V3_Free(addr) \ do { \ - extern struct vmm_os_hooks * os_hooks; \ + extern struct v3_os_hooks * os_hooks; \ if ((os_hooks) && (os_hooks)->free) { \ (os_hooks)->free(addr); \ } \ @@ -109,7 +148,7 @@ #define V3_CPU_KHZ() \ ({ \ unsigned int khz = 0; \ - extern struct vmm_os_hooks * os_hooks; \ + extern struct v3_os_hooks * os_hooks; \ if ((os_hooks) && (os_hooks)->get_cpu_khz) { \ khz = (os_hooks)->get_cpu_khz(); \ } \ @@ -120,14 +159,25 @@ #define V3_Hook_Interrupt(irq, opaque) \ ({ \ - int ret = 0; \ - extern struct vmm_os_hooks * os_hooks; \ + int ret = 0; \ + extern struct v3_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 v3_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->yield_cpu) { \ + (os_hooks)->yield_cpu(); \ + } \ + } while (0) \ + + + + /* ** */ @@ -148,33 +198,25 @@ #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 { +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, ...); + // __attribute__ ((format (printf, 1, 2))); void *(*allocate_pages)(int numPages); void (*free_page)(void * page); @@ -187,35 +229,71 @@ struct vmm_os_hooks { // int (*hook_interrupt)(struct guest_info *s, int irq); - int (*hook_interrupt)(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)(); + unsigned int (*get_cpu_khz)(void); - void (*start_kernel_thread)(); // include pointer to function + void (*start_kernel_thread)(void); // include pointer to function + + void (*yield_cpu)(void); + +}; + + +struct v3_vm_config { + void * rombios; + int rombios_size; + + void * vgabios; + int vgabios_size; + + 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 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 (*start_guest)(struct guest_info * info); // int (*stop_vm)(uint_t vm_id); - int (*has_nested_paging)(); + int (*has_nested_paging)(void); + + // v3_cpu_arch_t (*get_cpu_arch)(); }; -void Init_V3(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 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