X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=8d348e6c7f421ce7e820256711f85440bb893b28;hb=9b82fd29e9dc2b85339938098f77d8cf3487b099;hp=640144ecd54bb678aab22d8c0390f503e03f7840;hpb=feae9dcec518f57049429ee391f903745cb04749;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 640144e..8d348e6 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -30,7 +30,6 @@
 #include <palacios/vmm_xml.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_msr.h>
-#include <palacios/vmm_mptable.h>
 #include <palacios/vmm_sprintf.h>
 
 
@@ -202,7 +201,7 @@ static inline uint32_t get_alignment(char * align_str) {
 	}
     }
     
-#ifndef CONFIG_ALIGNED_PG_ALLOC
+#ifndef V3_CONFIG_ALIGNED_PG_ALLOC
     if (alignment != PAGE_SIZE_4KB) {
 	PrintError("Aligned page allocations are not supported in this host (requested alignment=%d)\n", alignment);
 	PrintError("Ignoring alignment request\n");
@@ -247,7 +246,7 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
 	return -1;
     }
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     {
 	char * telemetry = v3_cfg_val(vm_cfg, "telemetry");
 
@@ -353,14 +352,18 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 	return -1;
     }
 
-    /* 
-     * Initialize configured extensions 
-     */
-    if (setup_extensions(vm, cfg) == -1) {
-	PrintError("Failed to setup extensions\n");
+
+    if (vm->vm_class == V3_PC_VM) {
+	if (post_config_pc(vm, cfg) == -1) {
+	    PrintError("PC Post configuration failure\n");
+	    return -1;
+	}
+    } else {
+	PrintError("Invalid VM Class\n");
 	return -1;
     }
 
+
     /* 
      * Initialize configured devices
      */
@@ -374,16 +377,17 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     v3_print_msr_map(vm);
 
 
-    if (vm->vm_class == V3_PC_VM) {
-	if (post_config_pc(vm, cfg) == -1) {
-	    PrintError("PC Post configuration failure\n");
-	    return -1;
-	}
-    } else {
-	PrintError("Invalid VM Class\n");
+
+
+    /* 
+     * Initialize configured extensions 
+     */
+    if (setup_extensions(vm, cfg) == -1) {
+	PrintError("Failed to setup extensions\n");
 	return -1;
     }
 
+
     return 0;
 }
 
@@ -488,7 +492,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;