X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=5e0defc3558cc5c8bc29edee698002ea0349defb;hb=623de2de1c4a31c29975867343b7a78962094fee;hp=85732935f2045ed4575d96f5f12f884baa4c8d0e;hpb=e92ee3df43ad8bb603acce2832a67cc2eea794c0;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 8573293..5e0defc 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -24,6 +24,7 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vmm_profiler.h>
 #include <palacios/vmm_mem.h>
+#include <palacios/vmm_hypercall.h>
 
 
 #include <devices/serial.h>
@@ -37,6 +38,7 @@
 #include <devices/bochs_debug.h>
 #include <devices/os_debug.h>
 #include <devices/apic.h>
+#include <devices/io_apic.h>
 
 
 
@@ -84,6 +86,9 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
   
   v3_init_shadow_map(info);
   
+  v3_init_hypercall_map(info);
+
+  
   if (v3_cpu_type == V3_SVM_REV3_CPU) {
     info->shdw_pg_mode = NESTED_PAGING;
   } else {
@@ -218,7 +223,8 @@ 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 * 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;
@@ -248,7 +254,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);
+    v3_attach_device(info, apic);
+    v3_attach_device(info, ioapic);
 
     if (use_ramdisk) {
       v3_attach_device(info, ramdisk);