X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=300ac56202371fe62282ee8a26b5897e613afa09;hb=624a05de781c51ed5d34a6db2583f884918a9594;hp=e6beb43e078f83ccbba8f63bc922c79815c0088c;hpb=c34c7a69079dd6165db965454104f20c7d873c20;p=palacios.git

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index e6beb43..300ac56 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -303,11 +303,11 @@ 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);
 
@@ -315,6 +315,8 @@ int RunVMM(struct Boot_Info * bootInfo) {
       }
 
       hook_irq(&vm_info, 6);
+      hook_irq(&vm_info, 14);
+      hook_irq(&vm_info, 15);
 
       vm_info.rip = 0xfff0;
       vm_info.vm_regs.rsp = 0x0;