X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=cf0d4bd6b00bcd72c29296e8fde1fb5b7d8bcf6f;hb=926e4e742c02e6f1255c8da243494c8bbddbf752;hp=7077d664f93d31a985e7cae9b66d0d766bc2aab6;hpb=cfcc5717f659b3ed2954f41cf363d3bceae8dc84;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 7077d66..cf0d4bd 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -40,12 +40,6 @@ struct v3_os_hooks * os_hooks = NULL;
 int v3_dbg_enable = 0;
 
 
-static struct guest_info * allocate_guest() {
-    void * info = V3_Malloc(sizeof(struct guest_info));
-    memset(info, 0, sizeof(struct guest_info));
-    return info;
-}
-
 
 static void init_cpu(void * arg) {
     uint32_t cpu_id = (uint32_t)(addr_t)arg;
@@ -74,6 +68,8 @@ static void init_cpu(void * arg) {
 void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     int i;
 
+    V3_Print("V3 Print statement to fix a Kitten page fault bug\n");
+
     // Set global variables. 
     os_hooks = hooks;
 
@@ -84,6 +80,9 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     // Register all the possible device types
     v3_init_devices();
 
+    // Register all shadow paging handlers
+    V3_init_shdw_paging();
+
 #ifdef INSTRUMENT_VMM
     v3_init_instrumentation();
 #endif
@@ -104,45 +103,46 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id) {
 }
 
 
-struct guest_info * v3_create_vm(void * cfg) {
-    struct guest_info * info = allocate_guest();
-    
-    if (!info) {
-	PrintError("Could not allocate Guest\n");
-	return NULL;
-    }
+struct v3_vm_info * v3_create_vm(void * cfg) {
+    struct v3_vm_info * vm = v3_config_guest(cfg);
 
-    if (v3_config_guest(info, cfg) == -1) {
+    if (vm == NULL) {
 	PrintError("Could not configure guest\n");
 	return NULL;
     }
 
-    return info;
+    return vm;
 }
 
 
-int v3_start_vm(struct guest_info * info, unsigned int cpu_mask) {
-    
-    info->cpu_id = v3_get_cpu_id();
-
+int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
+    int i = 0;
     V3_Print("V3 --  Starting VM\n");
 
-    switch (v3_cpu_types[info->cpu_id]) {
+
+    for (i = 0; i < vm->num_cores; i++) {
+	struct guest_info * info = &(vm->cores[i]);
+
+	/* GRUESOM HACK... */
+	//	vm->cpu_id = v3_get_cpu_id();
+
+	switch (v3_cpu_types[info->cpu_id]) {
 #ifdef CONFIG_SVM
-	case V3_SVM_CPU:
-	case V3_SVM_REV3_CPU:
-	    return v3_start_svm_guest(info);
-	    break;
+	    case V3_SVM_CPU:
+	    case V3_SVM_REV3_CPU:
+		return v3_start_svm_guest(info);
+		break;
 #endif
 #if CONFIG_VMX
-	case V3_VMX_CPU:
-	case V3_VMX_EPT_CPU:
-	    return v3_start_vmx_guest(info);
-	    break;
+	    case V3_VMX_CPU:
+	    case V3_VMX_EPT_CPU:
+		return v3_start_vmx_guest(info);
+		break;
 #endif
-	default:
-	    PrintError("Attemping to enter a guest on an invalid CPU\n");
-	    return -1;
+	    default:
+		PrintError("Attemping to enter a guest on an invalid CPU\n");
+		return -1;
+	}
     }
 
     return 0;
@@ -193,7 +193,7 @@ void v3_yield_cond(struct guest_info * info) {
     uint64_t cur_cycle;
     rdtscll(cur_cycle);
 
-    if (cur_cycle > (info->yield_start_cycle + info->yield_cycle_period)) {
+    if (cur_cycle > (info->yield_start_cycle + info->vm_info->yield_cycle_period)) {
 
 	/*
 	  PrintDebug("Conditional Yield (cur_cyle=%p, start_cycle=%p, period=%p)\n", 
@@ -237,11 +237,11 @@ void v3_print_cond(const char * fmt, ...) {
 
 
 
-void v3_interrupt_cpu(struct guest_info * info, int logical_cpu) {
+void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu) {
     extern struct v3_os_hooks * os_hooks;
 
     if ((os_hooks) && (os_hooks)->interrupt_cpu) {
-	(os_hooks)->interrupt_cpu(info, logical_cpu);
+	(os_hooks)->interrupt_cpu(vm, logical_cpu);
     }
 }