v3_init_hypercall_map(info);
-
- if (v3_cpu_type == V3_SVM_REV3_CPU) {
+ if ((v3_cpu_type == V3_SVM_REV3_CPU) &&
+ (config_ptr->enable_nested_paging == 1)) {
+ PrintDebug("Guest Page Mode: NESTED_PAGING\n");
info->shdw_pg_mode = NESTED_PAGING;
} else {
+ PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
v3_init_shadow_page_state(info);
info->shdw_pg_mode = SHADOW_PAGING;
}
static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
struct vm_device * ide = NULL;
struct vm_device * ram_cd = NULL;
-#ifdef DEBUG_PCI
struct vm_device * pci = v3_create_pci();
-#endif
struct vm_device * nvram = v3_create_nvram();
//struct vm_device * timer = v3_create_timer();
struct vm_device * pic = v3_create_pic();
int use_ramdisk = config_ptr->use_ramdisk;
int use_generic = USE_GENERIC;
- ide = v3_create_ide();
+ ide = v3_create_ide(pci);
if (use_ramdisk) {
PrintDebug("Creating Ramdisk\n");
generic = configure_generic(info, config_ptr);
}
-#ifdef DEBUG_PCI
+
v3_attach_device(info, pci);
-#endif
v3_attach_device(info, nvram);
//v3_attach_device(info, timer);