X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=8844dee1e6e9fe91247948732fab0d68ccff05b8;hb=e02cc15e36e8f5d7ee66390986351748dd9a16a1;hp=ecbb9962d6805e71e5a52aa5d9b4bdc9754b5019;hpb=a02f23087d0ea3df6dbd494de90754b3302ee9a5;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index ecbb996..8844dee 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -31,7 +31,7 @@
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_mptable.h>
-
+#include <palacios/vmm_sprintf.h>
 
 
 
@@ -166,7 +166,6 @@ static struct v3_config * parse_config(void * cfg_blob) {
 	    return NULL;
 	}
 
-
 	V3_Print("File index=%d id=%s\n", idx, id);
 
 	strncpy(file->tag, id, 256);
@@ -212,15 +211,16 @@ static inline uint32_t get_alignment(char * align_str) {
 
     return alignment;
 }
-static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
 
 
+static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     char * memory_str = v3_cfg_val(vm_cfg, "memory");
     char * schedule_hz_str = v3_cfg_val(vm_cfg, "schedule_hz");
     char * vm_class = v3_cfg_val(vm_cfg, "class");
     char * align_str = v3_cfg_val(v3_cfg_subtree(vm_cfg, "memory"), "alignment");
     uint32_t sched_hz = 100; 	// set the schedule frequency to 100 HZ
-    
+
+
     if (!memory_str) {
 	PrintError("Memory is a required configuration parameter\n");
 	return -1;
@@ -234,10 +234,11 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     }
 
     // Amount of ram the Guest will have, always in MB
-    vm->mem_size = atoi(memory_str) * 1024 * 1024;
+    vm->mem_size = (addr_t)atoi(memory_str) * 1024 * 1024;
     vm->mem_align = get_alignment(align_str);
 
-    PrintDebug("Alignment computed as 0x%x\n", vm->mem_align);
+
+    PrintDebug("Alignment for %lu bytes of memory computed as 0x%x\n", vm->mem_size, vm->mem_align);
 
     if (strcasecmp(vm_class, "PC") == 0) {
 	vm->vm_class = V3_PC_VM;
@@ -278,8 +279,8 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     return 0;
 }
 
-static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_cfg)
-{
+
+static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
     extern v3_cpu_arch_t v3_cpu_types[];
 
     v3_cfg_tree_t * vm_tree = info->vm_info->cfg_data->cfg;
@@ -291,7 +292,7 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c
 
     if (pg_mode) {
 	if ((strcasecmp(pg_mode, "nested") == 0)) {
-	    if (v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) {
+	    if (v3_cpu_types[info->host_cpu_id] == V3_SVM_REV3_CPU) {
 	    	info->shdw_pg_mode = NESTED_PAGING;
 	    } else {
 		PrintError("Nested paging not supported on this hardware. Defaulting to shadow paging\n");
@@ -337,10 +338,22 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c
 }
 
 static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
-
+    char *hcpu;
     if (determine_paging_mode(info, core_cfg))
 	return -1;
 
+    hcpu = v3_cfg_val(core_cfg, "hostcpu");
+    if (hcpu) {
+	int req_id = atoi(hcpu);
+	if (req_id < 0) {
+	    PrintError("Invalid host core %d requested by"
+		       " virtual cpu %d - ignored.\n", req_id, info->cpu_id);
+	} else {
+		PrintDebug("Assigned host core %d to virtual core %d.\n", info->cpu_id, req_id);
+	    info->host_cpu_id = req_id;
+	}
+    } 
+
     v3_init_core(info);
 
     if (info->vm_info->vm_class == V3_PC_VM) {
@@ -428,8 +441,8 @@ static struct v3_vm_info * allocate_guest(int num_cores) {
 
 
 
-struct v3_vm_info * v3_config_guest(void * cfg_blob) {
-    v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
+struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) {
+    v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
     struct v3_config * cfg_data = NULL;
     struct v3_vm_info * vm = NULL;
     int num_cores = 0;
@@ -457,7 +470,6 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
     }
 
     num_cores = atoi(v3_cfg_val(cores_cfg, "count"));
-
     if (num_cores == 0) {
 	PrintError("No cores specified in configuration\n");
 	return NULL;
@@ -472,6 +484,8 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
 	return NULL;
     }
 
+    vm->host_priv_data = priv_data;
+
     vm->cfg_data = cfg_data;
 
     V3_Print("Preconfiguration\n");
@@ -481,7 +495,6 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
 	return NULL;
     }
 
-
     V3_Print("Per core configuration\n");
     per_core_cfg = v3_cfg_subtree(cores_cfg, "core");
 
@@ -492,12 +505,14 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
 	info->cpu_id = i;
 	info->vm_info = vm;
 	info->core_cfg_data = per_core_cfg;
+	info->host_cpu_id = i; // may be overriden by core config
 
 	if (pre_config_core(info, per_core_cfg) == -1) {
 	    PrintError("Error in core %d preconfiguration\n", i);
 	    return NULL;
 	}
 
+
 	per_core_cfg = v3_cfg_next_branch(per_core_cfg);
     }
 
@@ -528,6 +543,16 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
 
 
 
+int v3_free_config(struct v3_vm_info * vm) {
+   
+    v3_free_htable(vm->cfg_data->file_table, 1, 0);
+
+    v3_xml_free(vm->cfg_data->cfg);
+
+    V3_Free(vm->cfg_data);
+    return 0;
+}
+
 
 
 static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {