}
-
-void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
- int i;
+void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus) {
+ int i = 0;
+ int minor = 0;
+ int major = 0;
V3_Print("V3 Print statement to fix a Kitten page fault bug\n");
V3_init_checkpoint();
#endif
-
-
-
if ((hooks) && (hooks->call_on_cpu)) {
- for (i = 0; i < num_cpus; i++) {
- V3_Print("Initializing VMM extensions on cpu %d\n", i);
- hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i);
+ for (i = 0; i < num_cpus; i++) {
+ major = i / 8;
+ minor = i % 8;
- if (v3_mach_type == V3_INVALID_CPU) {
- v3_mach_type = v3_cpu_types[i];
- }
+ if ((cpu_mask == NULL) || (*(cpu_mask + major) & (0x1 << minor))) {
+ V3_Print("Initializing VMM extensions on cpu %d\n", i);
+ hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i);
- }
+ if (v3_mach_type == V3_INVALID_CPU) {
+ v3_mach_type = v3_cpu_types[i];
+ }
+ }
+ }
}
-
-
}
+
void Shutdown_V3() {
int i;
uint32_t avail_cores = 0;
int vcore_id = 0;
+
+ if (vm->run_state != VM_STOPPED) {
+ PrintError("VM has already been launched (state=%d)\n", (int)vm->run_state);
+ return -1;
+ }
+
/// CHECK IF WE ARE MULTICORE ENABLED....
V3_Print("V3 -- Starting VM (%u cores)\n", vm->num_cores);
break;
}
- v3_yield(NULL);
+ v3_yield(NULL,-1);
}
V3_Print("VM stopped. Returning\n");
V3_Print("Simulation callback activated (guest_rip=%p)\n", (void *)core->rip);
while (v3_bitmap_check(timeout_map, core->vcpu_id) == 1) {
- v3_yield(NULL);
+ v3_yield(NULL,-1);
}
return 0;
break;
}
- v3_yield(NULL);
+ v3_yield(NULL,-1);
}
#endif
-#define V3_Yield(addr) \
- do { \
- extern struct v3_os_hooks * os_hooks; \
- if ((os_hooks) && (os_hooks)->yield_cpu) { \
- (os_hooks)->yield_cpu(); \
- } \
- } while (0) \
-void v3_yield_cond(struct guest_info * info) {
+void v3_yield_cond(struct guest_info * info, int usec) {
uint64_t cur_cycle;
cur_cycle = v3_get_host_time(&info->time_state);
// (void *)cur_cycle, (void *)info->yield_start_cycle,
// (void *)info->yield_cycle_period);
- V3_Yield();
- info->yield_start_cycle = v3_get_host_time(&info->time_state);
+ if (usec < 0) {
+ V3_Yield();
+ } else {
+ V3_Yield_Timed(usec);
+ }
+
+ info->yield_start_cycle += info->vm_info->yield_cycle_period;
}
}
* unconditional cpu yield
* if the yielding thread is a guest context, the guest quantum is reset on resumption
* Non guest context threads should call this function with a NULL argument
- */
-void v3_yield(struct guest_info * info) {
- V3_Yield();
+ *
+ * usec <0 => the non-timed yield is used
+ * usec >=0 => the timed yield is used, which also usually implies interruptible
+ */
+void v3_yield(struct guest_info * info, int usec) {
+ if (usec < 0) {
+ V3_Yield();
+ } else {
+ V3_Yield_Timed(usec);
+ }
if (info) {
- info->yield_start_cycle = v3_get_host_time(&info->time_state);
+ info->yield_start_cycle += info->vm_info->yield_cycle_period;
}
}