X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=fe50c29c7fae9b5eeb2d007a22cf095ab0f57c6d;hp=adef73204bce33c5eb799388508b7e4338253a3e;hb=d16ef42bba84c7fe88352e5dc23e5e70a5207e29;hpb=1da53ce8f6ab61d298d38cf3f1c4fcd9b1050ce8

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index adef732..fe50c29 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -9,6 +9,7 @@
 #include <devices/timer.h>
 #include <devices/simple_pic.h>
 #include <devices/8259a.h>
+#include <devices/keyboard.h>
 
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_dev_mgr.h>
@@ -315,16 +316,26 @@ int RunVMM(struct Boot_Info * bootInfo) {
 	struct vm_device * nvram = create_nvram();
 	//struct vm_device * timer = create_timer();
 	struct vm_device * pic = create_pic();
+	struct vm_device * keyboard = create_keyboard();
 
 	attach_device(&(vm_info), nvram);
 	//attach_device(&(vm_info), timer);
 	attach_device(&(vm_info), pic);
+	attach_device(&(vm_info), keyboard);
 
 	PrintDebugDevMgr(&(vm_info.dev_mgr));
       }
 
+      // give keyboard interrupts to vm
+      //hook_irq(&vm_info, 1);
+      
+      // give floppy controller to vm
       hook_irq(&vm_info, 6);
+
+      // primary ide
       hook_irq(&vm_info, 14);
+
+      // secondary ide
       hook_irq(&vm_info, 15);