}
// Register all the possible device types
- v3_init_devices();
+ V3_init_devices();
// Register all shadow paging handlers
V3_init_shdw_paging();
vm->run_state = VM_STOPPED;
-
// force exit all cores via a cross call/IPI
- // Wait for all cores to enter CORE_STOPPED state
+ while (1) {
+ int i = 0;
+ int still_running = 0;
+
+ for (i = 0; i < vm->num_cores; i++) {
+ if (vm->cores[i].core_run_state != CORE_STOPPED) {
+ still_running = 1;
+ }
+ }
+ if (still_running == 0) {
+ break;
+ }
+ V3_Print("Yielding\n");
+
+ v3_yield(NULL);
+ }
+
+ V3_Print("VM stopped. Returning\n");
return 0;
}
int v3_free_vm(struct v3_vm_info * vm) {
+ int i = 0;
// deinitialize guest (free memory, etc...)
- v3_dev_mgr_deinit(vm);
+ v3_free_vm_devices(vm);
+
+ for (i = 0; i < vm->num_cores; i++) {
+ // free cores
+
+ v3_free_core(&(vm->cores[i]));
+
+ }
+
+ v3_free_vm_internal(vm);
+
+ // free vm
return 0;
}