X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=4375e436889821103db8035cc720e4e00064f5c0;hb=28b1d0ae6db40cb3e1f5a9b3596b625d2f2af0e4;hp=1005507db4a00bb2e90e8b5ca40f68bd68f12381;hpb=ace8f0532fa5650c6642a3a7174f3aa19b09095a;p=palacios.releases.git

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index 1005507..4375e43 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -7,6 +7,9 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <devices/nvram.h>
 #include <devices/timer.h>
+#include <devices/simple_pic.h>
+#include <palacios/vmm_intr.h>
+
 
 #define SPEAKER_PORT 0x61
 
@@ -157,6 +160,8 @@ int RunVMM(struct Boot_Info * bootInfo) {
     addr_t rsp;
     addr_t rip;
 
+
+
     memset(&os_hooks, 0, sizeof(struct vmm_os_hooks));
     memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops));
     memset(&vm_info, 0, sizeof(struct guest_info));
@@ -181,9 +186,9 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
     vm_info.cpu_mode = REAL;
 
-    init_irq_map(&(vm_info.irq_map));
+    //init_irq_map(&(vm_info.irq_map));
     init_vmm_io_map(&(vm_info.io_map));
-    init_interrupt_state(&(vm_info.intr_state));
+    init_interrupt_state(&vm_info);
 
     dev_mgr_init(&(vm_info.dev_mgr));
     
@@ -270,6 +275,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
 	PrintDebug("Error adding shadow region\n");
       }
 
+
       print_shadow_map(&(vm_info.mem_map));
 
       hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write, NULL);
@@ -286,12 +292,14 @@ int RunVMM(struct Boot_Info * bootInfo) {
       hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial, NULL);
 
       {
-	struct vm_device * nvram = create_nvram();
+	//struct vm_device * nvram = create_nvram();
 	//struct vm_device * timer = create_timer();
+	struct vm_device * pic = create_pic();
 
-	attach_device(&(vm_info), nvram);
+	//attach_device(&(vm_info), nvram);
 	//attach_device(&(vm_info), timer);
-	
+	attach_device(&(vm_info), pic);
+
 	PrintDebugDevMgr(&(vm_info.dev_mgr));
 	
 
@@ -299,6 +307,8 @@ int RunVMM(struct Boot_Info * bootInfo) {
       }
 
 
+      hook_irq(&vm_info, 6);
+
       vm_info.rip = 0xfff0;
       vm_info.vm_regs.rsp = 0x0;
     }