X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=5811cba38e207afb6e35606d491e916287748671;hb=0027db7c5ddd6b376f1d18e9cdd619126d5896c4;hp=66ce9c0a2520193018247dfd6d041ff243cc8d65;hpb=65b032e18e7f439d61d682c79884c2d017be6c4d;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 66ce9c0..5811cba 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -33,6 +33,10 @@ #include #endif +#ifdef CONFIG_VNET +#include +#endif + v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS]; struct v3_os_hooks * os_hooks = NULL; @@ -92,6 +96,11 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { v3_init_instrumentation(); #endif + +#ifdef CONFIG_VNET + V3_init_vnet(); +#endif + if ((hooks) && (hooks->call_on_cpu)) { for (i = 0; i < num_cpus; i++) { @@ -242,11 +251,11 @@ void v3_print_cond(const char * fmt, ...) { -void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu) { +void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) { extern struct v3_os_hooks * os_hooks; if ((os_hooks) && (os_hooks)->interrupt_cpu) { - (os_hooks)->interrupt_cpu(vm, logical_cpu); + (os_hooks)->interrupt_cpu(vm, logical_cpu, vector); } }