reverted host_cpu_id changes because it broke multicore functionality

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

diff --git a/palacios/src/palacios/vmm_symbiotic.c b/palacios/src/palacios/vmm_symbiotic.c
index 239efdc..32ef348 100644 (file)
--- a/palacios/src/palacios/vmm_symbiotic.c
+++ b/palacios/src/palacios/vmm_symbiotic.c
@@ -32,11 +32,11 @@ static int cpuid_fn(struct guest_info * core, uint32_t cpuid,
 
     *eax = *(uint32_t *)"V3V";
 
-    if ((v3_cpu_types[core->cpu_id] == V3_SVM_CPU) || 
-       (v3_cpu_types[core->cpu_id] == V3_SVM_REV3_CPU)) {
+    if ((v3_cpu_types[0] == V3_SVM_CPU) || 
+       (v3_cpu_types[0] == V3_SVM_REV3_CPU)) {
        *ebx = *(uint32_t *)"SVM";
-    } else if ((v3_cpu_types[core->cpu_id] == V3_VMX_CPU) || 
-              (v3_cpu_types[core->cpu_id] == V3_VMX_EPT_CPU)) {
+    } else if ((v3_cpu_types[0] == V3_VMX_CPU) || 
+              (v3_cpu_types[0] == V3_VMX_EPT_CPU)) {
        *ebx = *(uint32_t *)"VMX";
     }
 
@@ -75,6 +75,22 @@ int v3_init_symbiotic_vm(struct v3_vm_info * vm) {
 }
 
 
+int v3_deinit_symbiotic_vm(struct v3_vm_info * vm) {
+
+#ifdef CONFIG_SYMMOD
+    if (v3_deinit_symmod_vm(vm) == -1) {
+       PrintError("Error deinitializing global SymMod state\n");
+       return -1;
+    }
+#endif
+
+    v3_unhook_cpuid(vm, SYM_CPUID_NUM);
+
+    
+    return 0;
+}
+
+
 
 int v3_init_symbiotic_core(struct guest_info * core) {
     struct v3_sym_core_state * core_state = &(core->sym_core_state);
@@ -88,3 +104,9 @@ int v3_init_symbiotic_core(struct guest_info * core) {
 
     return 0;
 }
+
+
+int v3_deinit_symbiotic_core(struct guest_info * core) {
+
+    return 0;
+}