X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=9125d2e136bf1f12a28f8800184006e515c467cc;hb=3716aafce2de9e12ed62bee37968bfc0e0eaed44;hp=bb6f985b933aa735ab511c00d2b963e1f0c90420;hpb=498deda77301293d53089f7be0e56b914c932dfa;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index bb6f985..9125d2e 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -131,11 +131,23 @@ static struct v3_config * parse_config(void * cfg_blob) {
     offset += 8;
 
     cfg = (struct v3_config *)V3_Malloc(sizeof(struct v3_config));
+
+    if (!cfg) {
+	PrintError("Unable to allocate while parsing\n");
+	return NULL;
+    }
+
     memset(cfg, 0, sizeof(struct v3_config));
 
     cfg->blob = cfg_blob;
     INIT_LIST_HEAD(&(cfg->file_list));
     cfg->file_table = v3_create_htable(0, file_hash_fn, file_eq_fn);
+
+    if (!(cfg->file_table)) {
+	PrintError("Unable to allocate hash table while parsing\n");
+	V3_Free(cfg);
+	return NULL;
+    }
     
     xml_len = *(uint32_t *)(cfg_blob + offset);
     offset += 4;
@@ -162,12 +174,14 @@ static struct v3_config * parse_config(void * cfg_blob) {
 	
 	if (!file) {
 	    PrintError("Could not allocate file structure\n");
+	    v3_free_htable(cfg->file_table,0,0);
+	    V3_Free(cfg);
 	    return NULL;
 	}
 
 	V3_Print("File index=%d id=%s\n", idx, id);
 
-	strncpy(file->tag, id, 256);
+	strncpy(file->tag, id, V3_MAX_TAG_LEN);
 	file->size = hdr->size;
 	file->data = cfg_blob + hdr->offset;
 
@@ -280,7 +294,7 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
 
 
 static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
-    extern v3_cpu_arch_t v3_cpu_types[];
+    extern v3_cpu_arch_t v3_mach_type;
 
     v3_cfg_tree_t * vm_tree = info->vm_info->cfg_data->cfg;
     v3_cfg_tree_t * pg_tree = v3_cfg_subtree(vm_tree, "paging");
@@ -291,22 +305,25 @@ static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_
     if (pg_mode) {
 	if ((strcasecmp(pg_mode, "nested") == 0)) {
 	    // we assume symmetric cores, so if core 0 has nested paging they all do
-	    if ((v3_cpu_types[0] == V3_SVM_REV3_CPU) || 
-		(v3_cpu_types[0] == V3_VMX_EPT_CPU) ||
-		(v3_cpu_types[0] == V3_VMX_EPT_UG_CPU)) {
+	    if ((v3_mach_type == V3_SVM_REV3_CPU) || 
+		(v3_mach_type == V3_VMX_EPT_CPU) ||
+		(v3_mach_type == V3_VMX_EPT_UG_CPU)) {
+		
+		V3_Print("Setting paging mode to NESTED\n");
 	    	info->shdw_pg_mode = NESTED_PAGING;
 	    } else {
 		PrintError("Nested paging not supported on this hardware. Defaulting to shadow paging\n");
 	    	info->shdw_pg_mode = SHADOW_PAGING;
 	    }
 	} else if ((strcasecmp(pg_mode, "shadow") == 0)) {
+	    V3_Print("Setting paging mode to SHADOW\n");
 	    info->shdw_pg_mode = SHADOW_PAGING;
 	} else {
 	    PrintError("Invalid paging mode (%s) specified in configuration. Defaulting to shadow paging\n", pg_mode);
 	    info->shdw_pg_mode = SHADOW_PAGING;
 	}
     } else {
-	PrintDebug("No paging type specified in configuration. Defaulting to shadow paging\n");
+	V3_Print("No paging type specified in configuration. Defaulting to shadow paging\n");
 	info->shdw_pg_mode = SHADOW_PAGING;
     }
 
@@ -325,7 +342,10 @@ static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
 	return -1;
     }
 
-    v3_init_core(info);
+    if (v3_init_core(info) == -1) {
+	PrintError("Error Initializing Core\n");
+	return -1;
+    }
 
     if (info->vm_info->vm_class == V3_PC_VM) {
 	if (pre_config_pc_core(info, core_cfg) == -1) {
@@ -344,7 +364,7 @@ static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
 
 static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     
-    vm->run_state = VM_STOPPED;
+
 
     // Configure the memory map for the guest
     if (setup_memory_map(vm, cfg) == -1) {
@@ -388,6 +408,8 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     }
 
 
+    vm->run_state = VM_STOPPED;
+
     return 0;
 }
 
@@ -395,7 +417,6 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
 static int post_config_core(struct guest_info * info, v3_cfg_tree_t * cfg) {
 
-    info->core_run_state = CORE_STOPPED;
  
     if (v3_init_core_extensions(info) == -1) {
         PrintError("Error intializing extension core states\n");
@@ -422,17 +443,30 @@ static struct v3_vm_info * allocate_guest(int num_cores) {
     int guest_state_size = sizeof(struct v3_vm_info) + (sizeof(struct guest_info) * num_cores);
     struct v3_vm_info * vm = V3_Malloc(guest_state_size);
 
+    if (!vm) {
+	PrintError("Unable to allocate space for guest data structures\n");
+	return NULL;
+    }
+
+    int i = 0;
+
     memset(vm, 0, guest_state_size);
 
     vm->num_cores = num_cores;
 
+    for (i = 0; i < num_cores; i++) {
+	vm->cores[i].core_run_state = CORE_INVALID;
+    }
+
+    vm->run_state = VM_INVALID;
+
     return vm;
 }
 
 
 
 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());
+    extern v3_cpu_arch_t v3_mach_type;
     struct v3_config * cfg_data = NULL;
     struct v3_vm_info * vm = NULL;
     int num_cores = 0;
@@ -440,7 +474,7 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) {
     v3_cfg_tree_t * cores_cfg = NULL;
     v3_cfg_tree_t * per_core_cfg = NULL;
 
-    if (cpu_type == V3_INVALID_CPU) {
+    if (v3_mach_type == V3_INVALID_CPU) {
 	PrintError("Configuring guest on invalid CPU\n");
 	return NULL;
     }
@@ -492,7 +526,7 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) {
     for (i = 0; i < vm->num_cores; i++) {
 	struct guest_info * info = &(vm->cores[i]);
 
-	info->cpu_id = i;
+	info->vcpu_id = i;
 	info->vm_info = vm;
 	info->core_cfg_data = per_core_cfg;
 
@@ -573,6 +607,11 @@ static int setup_extensions(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     while (extension) {
 	char * ext_name = v3_cfg_val(extension, "name");
 
+        if (!ext_name) {
+            PrintError("Extension has no name\n");
+            return -1;
+        }
+
 	V3_Print("Configuring extension %s\n", ext_name);
 
 	if (v3_add_extension(vm, ext_name, extension) == -1) {