Insert mptable even on single core guest if an apic exists

Do not allow multicore guests without an apic
Warn strenously if an apic exists but no ioapic exists

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index 9fcf197..0c7ef4c 100644 (file)
--- a/palacios/src/palacios/vmm_config_class.h
+++ b/palacios/src/palacios/vmm_config_class.h
@@ -77,13 +77,21 @@ static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     }
 
 
-    if (vm->num_cores > 1) {
+    if (vm->num_cores>1 && !v3_find_dev(vm,"apic")) { 
+       PrintError("palacios: VM has more than one core, but no device named \"apic\"!\n");
+       return -1;
+    } 
+    
+    if (v3_find_dev(vm,"apic")) { 
+       if (!v3_find_dev(vm,"ioapic")) { 
+           PrintError("palacios: VM cores have apics, but there is no device named \"ioapic\"!\n");
+       }
        if (v3_inject_mptable(vm) == -1) { 
            PrintError("Failed to inject mptable during configuration\n");
            return -1;
        }
     }
-
+    
     return 0;
 }