}
// Register all the possible device types
- v3_init_devices();
+ V3_init_devices();
// Register all shadow paging handlers
V3_init_shdw_paging();
struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name) {
- struct v3_vm_info * vm = v3_config_guest(cfg);
+ struct v3_vm_info * vm = v3_config_guest(cfg, priv_data);
V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip));
return NULL;
}
-
-
if (name == NULL) {
name = "[V3_VM]";
} else if (strlen(name) >= 128) {
memset(vm->name, 0, 128);
strncpy(vm->name, name, 127);
- vm->host_priv_data = priv_data;
-
return vm;
}
#define MAX_CORES 32
-static int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
+int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
uint32_t i;
int vcore_id = 0;
uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier
}
if (vm->num_cores > avail_cores) {
- PrintError("Attempted to start a VM with too many cores (MAX=%d)\n", MAX_CORES);
+ PrintError("Attempted to start a VM with too many cores (vm->num_cores = %d, avail_cores = %d, MAX=%d)\n", vm->num_cores, avail_cores, MAX_CORES);
return -1;
}
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_free_vm_devices(vm);
+
+ // free cores
+ for (i = 0; i < vm->num_cores; i++) {
+ v3_free_core(&(vm->cores[i]));
+ }
+
+ // free vm
+ v3_free_vm_internal(vm);
+
+ v3_free_config(vm);
+
+ V3_Free(vm);
+
return 0;
}