X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=40671608ef9df923e524e3ed5fbfd41a6742f183;hb=e0519b6111165e0d99987d7f852875366c41bfd9;hp=180a6180137fd7b8daa241f0972d03636562cd69;hpb=362391accc505b29d938e9d0a21bf6a28a8cee34;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 180a618..4067160 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -25,6 +25,7 @@
 #include <palacios/vmm_profiler.h>
 #include <palacios/vmm_mem.h>
 
+
 #include <devices/serial.h>
 #include <devices/keyboard.h>
 #include <devices/8259a.h>
@@ -34,6 +35,8 @@
 #include <devices/ramdisk.h>
 #include <devices/cdrom.h>
 #include <devices/bochs_debug.h>
+#include <devices/os_debug.h>
+#include <devices/apic.h>
 
 
 
@@ -78,7 +81,7 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
   v3_init_host_events(info);
 
   v3_init_decoder(info);
-
+  
   v3_init_shadow_map(info);
   
   if (v3_cpu_type == V3_SVM_REV3_CPU) {
@@ -195,7 +198,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
   v3_add_shadow_mem(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
  
   // test - give linux accesss to PCI space - PAD
-  v3_add_shadow_mem(info, 0xc0000000,0xffffffff,0xc0000000);
+  //v3_add_shadow_mem(info, 0xc0000000,0xffffffff,0xc0000000);
   
   
   print_shadow_map(info);
@@ -214,6 +217,8 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     struct vm_device * keyboard = v3_create_keyboard();
     struct vm_device * pit = v3_create_pit(); 
     struct vm_device * bochs_debug = v3_create_bochs_debug();
+    struct vm_device * os_debug = v3_create_os_debug();
+    struct vm_device * apic = v3_create_apic();
 
     //struct vm_device * serial = v3_create_serial();
     struct vm_device * generic = NULL;
@@ -241,6 +246,9 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     v3_attach_device(info, keyboard);
     // v3_attach_device(info, serial);
     v3_attach_device(info, bochs_debug);
+    v3_attach_device(info, os_debug);
+
+    v3_attach_device(info, apic);
 
     if (use_ramdisk) {
       v3_attach_device(info, ramdisk);