From: Peter Dinda <pdinda@northwestern.edu>
Date: Fri, 30 May 2008 20:21:56 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: boot386puppy-26-to-ide~31
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=1a8382a1bd0a4e537b28d7906399bee2bff043de

*** empty log message ***
---

diff --git a/palacios/build/rombios b/palacios/build/rombios
index 0bf32a0..e5abff4 100644
Binary files a/palacios/build/rombios and b/palacios/build/rombios differ
diff --git a/palacios/build/vm_kernel b/palacios/build/vm_kernel
index 12806a7..8472a30 100755
Binary files a/palacios/build/vm_kernel and b/palacios/build/vm_kernel differ
diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index 1b46b2f..2a67e38 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -317,10 +317,10 @@ int RunVMM(struct Boot_Info * bootInfo) {
       {
 	
 	struct vm_device * nvram = create_nvram();
-	struct vm_device * timer = create_timer();
+	//struct vm_device * timer = create_timer();
 	struct vm_device * pic = create_pic();
 	struct vm_device * keyboard = create_keyboard();
-	//struct vm_device * pit = create_pit();
+	struct vm_device * pit = create_pit();
 
 	//generic_port_range_type range = {0,1024} ; // hook first 1024 ports if not already hooked
 
@@ -328,9 +328,9 @@ int RunVMM(struct Boot_Info * bootInfo) {
 	
 
 	attach_device(&(vm_info), nvram);
-	attach_device(&(vm_info), timer);
+	//attach_device(&(vm_info), timer);
 	attach_device(&(vm_info), pic);
-	//attach_device(&(vm_info), pit);
+	attach_device(&(vm_info), pit);
 	attach_device(&(vm_info), keyboard);
 
 	// Important that this be attached last!