Cleanup and sanity-checking of before/after null-check and copy+paste errors (Coverit...

[palacios.git] / palacios / src / palacios / vmm_config.c

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 374c1a5..e4c9b4f 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -37,6 +37,10 @@
 #include <palacios/vmm_swapping.h>
 #endif
 
+#ifdef V3_CONFIG_MULTIBOOT
+#include <palacios/vmm_multiboot.h>
+#endif
+
 #ifdef V3_CONFIG_HVM
 #include <palacios/vmm_hvm.h>
 #endif
@@ -225,6 +229,7 @@ static struct v3_config * parse_config(void * cfg_blob) {
        V3_Print(VM_NONE, VCORE_NONE, "File index=%d id=%s\n", idx, id);
 
        strncpy(file->tag, id, V3_MAX_TAG_LEN);
+       file->tag[V3_MAX_TAG_LEN-1] = 0 ;
 
        if (version==0) { 
            struct file_hdr_v0 * hdr = &(files_v0->hdrs[idx]);
@@ -289,6 +294,7 @@ static inline uint32_t get_alignment(char * align_str) {
     if (alignment != PAGE_SIZE_4KB) {
        PrintError(VM_NONE, VCORE_NONE, "Aligned page allocations are not supported in this host (requested alignment=%d)\n", alignment);
        PrintError(VM_NONE, VCORE_NONE, "Ignoring alignment request\n");
+       alignment = PAGE_SIZE_4KB;
     }
 #endif 
 
@@ -320,6 +326,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 = (addr_t)atoi(memory_str) * 1024 * 1024;
     vm->mem_align = get_alignment(align_str);
+
+    // set up defaults for memory management for threads associated 
+    // with this VM
+    vm->resource_control.pg_alignment=vm->mem_align;
+    vm->resource_control.pg_node_id=-1;
     
 #ifdef V3_CONFIG_SWAPPING
     if (v3_init_swapping_vm(vm,vm_cfg)) {
@@ -355,6 +366,17 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     }
 #endif
 
+    if (v3_init_vm(vm) == -1) {
+       PrintError(VM_NONE, VCORE_NONE, "Failed to initialize VM\n");
+       return -1;
+    }
+
+#ifdef V3_CONFIG_MULTIBOOT
+    if (v3_init_multiboot_vm(vm,vm_cfg)) { 
+       PrintError(vm,VCORE_NONE,"Cannot initialize Multiboot for VM\n");
+       return -1;
+    }
+#endif
 #ifdef V3_CONFIG_HVM
     if (v3_init_hvm_vm(vm,vm_cfg)) { 
        PrintError(vm,VCORE_NONE,"Cannot initialize HVM for VM\n");
@@ -362,14 +384,6 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     }
 #endif
 
-
-    if (v3_init_vm(vm) == -1) {
-       PrintError(VM_NONE, VCORE_NONE, "Failed to initialize VM\n");
-       return -1;
-    }
-
-
-
    if (schedule_hz_str) {
        sched_hz = atoi(schedule_hz_str);
     }
@@ -437,6 +451,12 @@ static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
        return -1;
     }
 
+#ifdef V3_CONFIG_MULTIBOOT
+    if (v3_init_multiboot_core(info)) { 
+       PrintError(info->vm_info, info, "Error Initializing Multiboot Core\n");
+       return -1;
+    }
+#endif
 #ifdef V3_CONFIG_HVM
     if (v3_init_hvm_core(info)) { 
        PrintError(info->vm_info, info, "Error Initializing HVM Core\n");
@@ -572,6 +592,10 @@ static struct v3_vm_info * allocate_guest(int num_cores) {
     return vm;
 }
 
+/*
+   
+
+*/
 
 
 struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) {
@@ -583,6 +607,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 (v3_mach_type == V3_INVALID_CPU) {
        PrintError(VM_NONE, VCORE_NONE, "Configuring guest on invalid CPU\n");
        return NULL;
@@ -590,11 +615,13 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) {
 
     cfg_data = parse_config(cfg_blob);
 
+
     if (!cfg_data) {
        PrintError(VM_NONE, VCORE_NONE, "Could not parse configuration\n");
        return NULL;
     }
 
+
     cores_cfg = v3_cfg_subtree(cfg_data->cfg, "cores");
 
     if (!cores_cfg) {
@@ -613,10 +640,20 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) {
     vm = allocate_guest(num_cores);    
 
     if (!vm) {
-       PrintError(VM_NONE, VCORE_NONE, "Could not allocate %d core guest\n", vm->num_cores);
+       PrintError(VM_NONE, VCORE_NONE, "Could not allocate %d core guest\n", num_cores);
        return NULL;
     }
 
+#ifdef V3_CONFIG_CACHEPART
+    // Need to initialize cache management and resource control
+    // as early as possible so that allocations are done accordingly
+    if (v3_init_cachepart_vm(vm,cfg_data->cfg)) {
+       PrintError(VM_NONE, VCORE_NONE, "Could not initialize cache partioning\n");
+       V3_Free(vm);
+       return NULL;
+    }
+#endif
+
     vm->host_priv_data = priv_data;
 
     vm->cfg_data = cfg_data;