#include <palacios/vmm.h>
#include <palacios/svm.h>
-//#include <palacios/vmx.h>
+#include <palacios/vmx.h>
#include <palacios/vmm_intr.h>
#include <palacios/vmm_config.h>
#include <palacios/vm_guest.h>
os_hooks = hooks;
v3_cpu_type = V3_INVALID_CPU;
+ // Register all the possible device types
+ v3_init_devices();
+
#ifdef INSTRUMENT_VMM
v3_init_instrumentation();
#endif
- if (v3_is_svm_capable()) {
-
- PrintDebug("Machine is SVM Capable\n");
- vmm_ops->allocate_guest = &allocate_guest;
- v3_init_SVM(vmm_ops);
+ vmm_ops->allocate_guest = &allocate_guest;
- /*
- } else if (is_vmx_capable()) {
- vmm_cpu_type = VMM_VMX_CPU;
- PrintDebug("Machine is VMX Capable\n");
- //Init_VMX();*/
+ if (v3_is_svm_capable()) {
+ PrintDebug("Machine is SVM Capable\n");
+ v3_init_SVM(vmm_ops);
+ } else if (v3_is_vmx_capable()) {
+ PrintDebug("Machine is VMX Capable\n");
+ v3_init_vmx(vmm_ops);
} else {
- PrintDebug("CPU has no virtualization Extensions\n");
+ PrintDebug("CPU has no virtualization Extensions\n");
}
}