#include <palacios/vmm_ctrl_regs.h>
#include <palacios/vmm_lowlevel.h>
#include <palacios/vmm_sprintf.h>
+#include <palacios/vmm_extensions.h>
#ifdef CONFIG_SVM
#include <palacios/svm.h>
v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS];
struct v3_os_hooks * os_hooks = NULL;
-
int v3_dbg_enable = 0;
// Register all shadow paging handlers
V3_init_shdw_paging();
+ // Register all extensions
+ V3_init_extensions();
+
#ifdef CONFIG_SYMMOD
V3_init_symmod();
V3_deinit_devices();
V3_deinit_shdw_paging();
+ V3_deinit_extensions();
+
#ifdef CONFIG_SYMMOD
V3_deinit_symmod();
#endif
struct guest_info * core = (struct guest_info *)p;
- PrintDebug("core %u: in start_core (RIP=%p)\n",
+ PrintDebug("virtual core %u: in start_core (RIP=%p)\n",
core->cpu_id, (void *)(addr_t)core->rip);
-
- // JRL: Whoa WTF? cpu_types are tied to the vcoreID????
- switch (v3_cpu_types[core->cpu_id]) {
+ switch (v3_cpu_types[0]) {
#ifdef CONFIG_SVM
case V3_SVM_CPU:
case V3_SVM_REV3_CPU:
int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
uint32_t i;
-#ifdef CONFIG_MULTITHREAD_OS
- int vcore_id = 0;
-#endif
uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier
uint32_t avail_cores = 0;
-
-
+ int vcore_id = 0;
/// CHECK IF WE ARE MULTICORE ENABLED....
V3_Print("V3 -- Starting VM (%u cores)\n", vm->num_cores);
V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip));
+
// Check that enough cores are present in the mask to handle vcores
for (i = 0; i < MAX_CORES; i++) {
int major = i / 8;
int minor = i % 8;
-
+
if (core_mask[major] & (0x1 << minor)) {
avail_cores++;
}
-
}
-
+
+
if (vm->num_cores > avail_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;
}
-
#ifdef CONFIG_MULTITHREAD_OS
// spawn off new threads, for other cores
for (i = 0, vcore_id = 1; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) {
void * core_thread = NULL;
struct guest_info * core = &(vm->cores[vcore_id]);
+ /* This assumes that the core 0 thread has been mapped to physical core 0 */
if (i == V3_Get_CPU()) {
- // We skip the local CPU, because it is reserved for vcore 0
+ // 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
+ PrintError("Logical CPU %d not available for virtual core %d; not started\n",
+ i, vcore_id);
continue;
}
int v3_vm_enter(struct guest_info * info) {
- switch (v3_cpu_types[info->cpu_id]) {
+ switch (v3_cpu_types[0]) {
#ifdef CONFIG_SVM
case V3_SVM_CPU:
case V3_SVM_REV3_CPU: