} else
#endif
{
- PrintError("CPU has no virtualizationExtensions\n");
+ PrintError("CPU has no virtualization Extensions\n");
}
}
}
// Register all the possible device types
- v3_init_devices();
+ V3_init_devices();
// Register all shadow paging handlers
V3_init_shdw_paging();
#ifdef CONFIG_VNET
- V3_init_vnet();
+ v3_init_vnet();
#endif
+
+#ifdef CONFIG_MULTITHREAD_OS
if ((hooks) && (hooks->call_on_cpu)) {
for (i = 0; i < num_cpus; i++) {
hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i);
}
}
+#else
+ init_cpu(0);
+#endif
+
+}
+
+
+void Deinit_V3() {
+
+
}
}
-struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data) {
- struct v3_vm_info * vm = v3_config_guest(cfg);
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name) {
+ 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));
+
if (vm == NULL) {
PrintError("Could not configure guest\n");
return NULL;
}
- vm->host_priv_data = priv_data;
+ if (name == NULL) {
+ name = "[V3_VM]";
+ } else if (strlen(name) >= 128) {
+ PrintError("VM name is too long. Will be truncated to 128 chars.\n");
+ }
+
+ memset(vm->name, 0, 128);
+ strncpy(vm->name, name, 127);
return vm;
}
// For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type...
#define MAX_CORES 32
+
int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
uint32_t i;
- char tname[16];
int vcore_id = 0;
uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier
uint32_t avail_cores = 0;
}
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;
}
- for (i = 0; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) {
+ // spawn off new threads, for other cores
+ for (i = 0, vcore_id = 1; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) {
int major = i / 8;
int minor = i % 8;
void * core_thread = NULL;
+ struct guest_info * core = &(vm->cores[vcore_id]);
+
+ if (i == V3_Get_CPU()) {
+ // We skip the local CPU, because it is reserved for vcore 0
+ continue;
+ }
+
if ((core_mask[major] & (0x1 << minor)) == 0) {
// cpuid not set in cpu_mask
PrintDebug("Starting virtual core %u on logical core %u\n",
vcore_id, i);
- sprintf(tname, "core%u", vcore_id);
+ sprintf(core->exec_name, "%s-%u", vm->name, vcore_id);
PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n",
- i, start_core, &(vm->cores[vcore_id]), tname);
+ i, start_core, core, core->exec_name);
// TODO: actually manage these threads instead of just launching them
- core_thread = V3_CREATE_THREAD_ON_CPU(i, start_core,
- &(vm->cores[vcore_id]), tname);
+ core_thread = V3_CREATE_THREAD_ON_CPU(i, start_core, core, core->exec_name);
if (core_thread == NULL) {
PrintError("Thread launch failed\n");
vcore_id++;
}
+ sprintf(vm->cores[0].exec_name, "%s", vm->name);
+
+ if (start_core(&(vm->cores[0])) != 0) {
+ PrintError("Error starting VM core 0\n");
+ return -1;
+ }
+
+
return 0;
}
+
+
int v3_stop_vm(struct v3_vm_info * vm) {
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;
}
}
-
+#ifdef CONFIG_MULTITHREAD_OS
void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) {
extern struct v3_os_hooks * os_hooks;
(os_hooks)->interrupt_cpu(vm, logical_cpu, vector);
}
}
-
-
-
-unsigned int v3_get_cpu_id() {
- extern struct v3_os_hooks * os_hooks;
- unsigned int ret = (unsigned int)-1;
-
- if ((os_hooks) && (os_hooks)->get_cpu) {
- ret = os_hooks->get_cpu();
- }
-
- return ret;
-}
+#endif