X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=c0c713e0ef721931e8b5890ad58d6723bc681eea;hb=1fe82881720f7f9f64f789871f763aca93b47a7e;hp=9c8d73ae1fe29b004c50bd0f99eb363ffeff501e;hpb=b35cb9f7d22a06d849820c8d4487c66f74ec42e2;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 9c8d73a..c0c713e 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -88,10 +88,12 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     
     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;
     }
@@ -279,7 +281,9 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
 static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
     struct vm_device * ramdisk = NULL;
     struct vm_device * cdrom = 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();
@@ -309,7 +313,9 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
 	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);