build fixes and cleanup code to handle VMM shutdown

[palacios-OLD.git] / palacios / src / palacios / vm_guest.c

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index 072ffac..c85c235 100644 (file)
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -337,6 +337,26 @@ void v3_print_guest_state(struct guest_info * info) {
     v3_print_disassembly(info);
 }
 
+void v3_print_guest_state_all(struct v3_vm_info * vm) {
+    int i = 0;
+
+    V3_Print("VM Core states for %s\n", vm->name);
+
+    for (i = 0; i < 80; i++) {
+       V3_Print("-");
+    }
+
+    for (i = 0; i < vm->num_cores; i++) {
+       v3_print_guest_state(&vm->cores[i]);  
+    }
+    
+    for (i = 0; i < 80; i++) {
+       V3_Print("-");
+    }
+
+    V3_Print("\n");    
+}
+
 
 void v3_print_stack(struct guest_info * info) {
     addr_t linear_addr = 0;
@@ -537,6 +557,11 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
     v3_remove_hypercall(vm, GUEST_INFO_HCALL);
 
 
+
+#ifdef CONFIG_SYMBIOTIC
+    v3_deinit_symbiotic_vm(vm);
+#endif
+
     // init SVM/VMX
     switch (cpu_type) {
 #ifdef CONFIG_SVM
@@ -562,9 +587,9 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
 
     v3_deinit_time_vm(vm);
 
-    v3_deinit_shdw_impl(vm);
     v3_deinit_mem_hooks(vm);
     v3_delete_mem_map(vm);
+    v3_deinit_shdw_impl(vm);
 
     v3_deinit_intr_routers(vm);
     v3_deinit_host_events(vm);
@@ -578,6 +603,8 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
     v3_deinit_telemetry(vm);
 #endif
 
+
+
     return 0;
 }
 
@@ -645,7 +672,7 @@ int v3_free_core(struct guest_info * core) {
 
     
 #ifdef CONFIG_SYMBIOTIC
-    //v3_deinit_symbiotic_core(core);
+    v3_deinit_symbiotic_core(core);
 #endif
 
     v3_deinit_decoder(core);