X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=b713975af67eb01aa49ea06f4cdbb85c1826dfb8;hb=176328b42924a56b53e4c7255ef83acb5847c621;hp=82f34e2c31eec9814c4f59ba1845749afee0e8ec;hpb=24178516ccd9f46718b687d4c630415eb63ff595;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 82f34e2..b713975 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -22,6 +22,9 @@
 #include <palacios/vmm_debug.h>
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_decoder.h>
+#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_mem.h>
+
 
 #include <devices/serial.h>
 #include <devices/keyboard.h>
@@ -32,6 +35,10 @@
 #include <devices/ramdisk.h>
 #include <devices/cdrom.h>
 #include <devices/bochs_debug.h>
+#include <devices/os_debug.h>
+#include <devices/apic.h>
+#include <devices/io_apic.h>
+
 
 
 #include <palacios/vmm_host_events.h>
@@ -75,7 +82,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) {
@@ -99,6 +106,14 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
   setup_devices(info, config_ptr);
  
 
+
+  if (config_ptr->enable_profiling) {
+    info->enable_profiler = 1;
+    v3_init_profiler(info);
+  } else {
+    info->enable_profiler = 0;
+  }
+
   //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
 
   // Setup initial cpu register state
@@ -152,7 +167,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 (0) {
+  if (1) {
     v3_add_shadow_mem(info, 0xa0000, 0xbffff, 0xa0000); 
   } else {
     v3_hook_write_mem(info, 0xa0000, 0xbffff, 0xa0000,  passthrough_mem_write, NULL);
@@ -184,7 +199,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);
@@ -203,6 +218,9 @@ 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 * ioapic = v3_create_io_apic(apic);
 
     //struct vm_device * serial = v3_create_serial();
     struct vm_device * generic = NULL;
@@ -230,6 +248,10 @@ 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);
+    v3_attach_device(info, ioapic);
 
     if (use_ramdisk) {
       v3_attach_device(info, ramdisk);