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=936250455b784adcf36d6552149eb3b534a55d2a;hpb=3574c981404a1c812d369132db09ec2a27d59a5d;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 9362504..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>
@@ -35,6 +36,7 @@
 #include <devices/cdrom.h>
 #include <devices/bochs_debug.h>
 #include <devices/os_debug.h>
+#include <devices/apic.h>
 
 
 
@@ -79,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) {
@@ -164,7 +166,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
       //     
   v3_add_shadow_mem(info, 0x0, 0x9ffff, (addr_t)V3_AllocPages(160));
   
-  if (1) {
+  if (0) {
     v3_add_shadow_mem(info, 0xa0000, 0xbffff, 0xa0000); 
   } else {
     v3_hook_write_mem(info, 0xa0000, 0xbffff, 0xa0000,  passthrough_mem_write, NULL);
@@ -196,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);
@@ -216,6 +218,7 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     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;
@@ -245,6 +248,8 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     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);
       v3_attach_device(info, cdrom);