X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=5e0defc3558cc5c8bc29edee698002ea0349defb;hb=1dbd6d179c681dbce107af39c4089d1aa13a714d;hp=942457362117f2ed700751d359c0139b329bbbce;hpb=6c56ead58f57e08c23eab5d67f2a58f95ce712b4;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 9424573..5e0defc 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -24,6 +24,8 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vmm_profiler.h>
 #include <palacios/vmm_mem.h>
+#include <palacios/vmm_hypercall.h>
+
 
 #include <devices/serial.h>
 #include <devices/keyboard.h>
@@ -36,6 +38,7 @@
 #include <devices/bochs_debug.h>
 #include <devices/os_debug.h>
 #include <devices/apic.h>
+#include <devices/io_apic.h>
 
 
 
@@ -80,9 +83,12 @@ 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);
   
+  v3_init_hypercall_map(info);
+
+  
   if (v3_cpu_type == V3_SVM_REV3_CPU) {
     info->shdw_pg_mode = NESTED_PAGING;
   } else {
@@ -218,6 +224,7 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     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;
@@ -248,6 +255,7 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     v3_attach_device(info, os_debug);
 
     v3_attach_device(info, apic);
+    v3_attach_device(info, ioapic);
 
     if (use_ramdisk) {
       v3_attach_device(info, ramdisk);