X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=2a67e385d3a5a08d8d4cf7ea3990db65a2e1bea2;hb=1a8382a1bd0a4e537b28d7906399bee2bff043de;hp=160be77e4c4890d259a90abb105050e8527224f7;hpb=90b8236597004a37a9d5acb33a1b1f987fe9070c;p=palacios.git

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index 160be77..2a67e38 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -5,6 +5,7 @@
 #include <geekos/vm.h>
 #include <geekos/screen.h>
 
+#include <devices/generic.h>
 #include <devices/nvram.h>
 #include <devices/timer.h>
 #include <devices/simple_pic.h>
@@ -314,17 +315,26 @@ 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 * timer = create_timer();
 	struct vm_device * pic = create_pic();
-	//struct vm_device * keyboard = create_keyboard();
+	struct vm_device * keyboard = create_keyboard();
 	struct vm_device * pit = create_pit();
 
+	//generic_port_range_type range = {0,1024} ; // hook first 1024 ports if not already hooked
+
+	//struct vm_device * generic = create_generic(&range,1,NULL,0,NULL,0);
+	
+
 	attach_device(&(vm_info), nvram);
 	//attach_device(&(vm_info), timer);
 	attach_device(&(vm_info), pic);
 	attach_device(&(vm_info), pit);
-	//attach_device(&(vm_info), keyboard);
+	attach_device(&(vm_info), keyboard);
+
+	// Important that this be attached last!
+	//attach_device(&(vm_info), generic);
 
 	PrintDebugDevMgr(&(vm_info.dev_mgr));
       }