}
-
-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_RUNNING ||
+ vm->run_state == VM_INVALID ||
+ vm->run_state == VM_ERROR) {
+ 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);
#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 *)info->yield_cycle_period);
V3_Yield();
- info->yield_start_cycle = v3_get_host_time(&info->time_state);
+ info->yield_start_cycle += info->vm_info->yield_cycle_period;
}
}
V3_Yield();
if (info) {
- info->yield_start_cycle = v3_get_host_time(&info->time_state);
+ info->yield_start_cycle += info->vm_info->yield_cycle_period;
}
}
+/*
+ * unconditional cpu yield for a period of time
+ * Otherwise identical to v3_yield
+ */
+void v3_yield_timed(struct guest_info *info, unsigned int usec)
+{
+ V3_Yield_Timed(usec);
+
+ if (info) {
+ info->yield_start_cycle += info->vm_info->yield_cycle_period;
+ }
+}
void v3_print_cond(const char * fmt, ...) {