From: Zheng Cui <zcui293@gmail.com>
Date: Thu, 14 Aug 2008 20:04:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: 1.0~68
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=175e16eb9ea5db34e144aa3a4e0faa0fc87ce5e9;p=palacios.git

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

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 40a01e1..b4a27c6 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,6 @@
 # Makefile for GeekOS kernel, userspace, and tools
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.63 $
+# $Revision: 1.64 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
diff --git a/palacios/include/geekos/bootinfo.h b/palacios/include/geekos/bootinfo.h
index dcc48b4..8583f84 100644
--- a/palacios/include/geekos/bootinfo.h
+++ b/palacios/include/geekos/bootinfo.h
@@ -1,7 +1,7 @@
 /*
  * Boot information structure, passed to kernel Main() routine
  * Copyright (c) 2001, David H. Hovemeyer <daveho@cs.umd.edu>
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
diff --git a/palacios/include/geekos/defs.h b/palacios/include/geekos/defs.h
index 7ad4b48..1f9d828 100644
--- a/palacios/include/geekos/defs.h
+++ b/palacios/include/geekos/defs.h
@@ -1,7 +1,7 @@
 /*
  * Misc. kernel definitions
  * Copyright (c) 2001,2004 David H. Hovemeyer <daveho@cs.umd.edu>
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
diff --git a/palacios/src/geekos/defs.asm b/palacios/src/geekos/defs.asm
index fa151ab..5dd71e6 100644
--- a/palacios/src/geekos/defs.asm
+++ b/palacios/src/geekos/defs.asm
@@ -1,6 +1,6 @@
 ; Definitions for use in GeekOS boot code
 ; Copyright (c) 2001, David H. Hovemeyer <daveho@cs.umd.edu>
-; $Revision: 1.11 $
+; $Revision: 1.12 $
 
 ; This is free software.  You are permitted to use,
 ; redistribute, and modify it as specified in the file "COPYING".
diff --git a/palacios/src/geekos/mem.c b/palacios/src/geekos/mem.c
index 4b06bb7..45df0b1 100644
--- a/palacios/src/geekos/mem.c
+++ b/palacios/src/geekos/mem.c
@@ -2,7 +2,7 @@
  * Physical memory allocation
  * Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
  * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -211,10 +211,10 @@ void Init_Mem(struct Boot_Info* bootInfo)
     initrdAddr = vmmMemEnd;
     initrdEnd = Round_Up_To_Page(initrdAddr + s_ramdiskSize);
     PrintBoth("mem.c(%d) Move ramdisk(%dB) from %x to %x", __LINE__, s_ramdiskSize, g_ramdiskImage, initrdAddr);
-    memcpy(initrdAddr, g_ramdiskImage, s_ramdiskSize);
+    memcpy((ulong_t *)initrdAddr, (ulong_t *)g_ramdiskImage, s_ramdiskSize);
     PrintBoth(" done\n");
     PrintBoth("mem.c(%d) Set 0 to unused bytes in the last ramdisk page from %x to %x", __LINE__, initrdAddr+s_ramdiskSize, initrdEnd);
-    memset(initrdAddr+s_ramdiskSize, 0, initrdEnd-(initrdAddr+s_ramdiskSize));
+    memset((ulong_t *)initrdAddr+s_ramdiskSize, 0, initrdEnd-(initrdAddr+s_ramdiskSize));
     PrintBoth(" done\n");
     /*
      * Zheng 08/03/2008
diff --git a/palacios/src/geekos/setup.asm b/palacios/src/geekos/setup.asm
index 5650f59..a085c35 100644
--- a/palacios/src/geekos/setup.asm
+++ b/palacios/src/geekos/setup.asm
@@ -1,7 +1,7 @@
 ; -*- fundamental -*-
 ; GeekOS setup code
 ; Copyright (c) 2001,2004 David H. Hovemeyer <daveho@cs.umd.edu>
-; $Revision: 1.7 $
+; $Revision: 1.8 $
 
 ; This is free software.  You are permitted to use,
 ; redistribute, and modify it as specified in the file "COPYING".
diff --git a/palacios/src/vmboot/rombios/rombios.c b/palacios/src/vmboot/rombios/rombios.c
index 258154e..f754bad 100644
--- a/palacios/src/vmboot/rombios/rombios.c
+++ b/palacios/src/vmboot/rombios/rombios.c
@@ -1,6 +1,6 @@
 //  -*- fundamental -*-
 /////////////////////////////////////////////////////////////////////////
-// $Id: rombios.c,v 1.15 2008/08/14 18:37:38 cuizheng Exp $
+// $Id: rombios.c,v 1.16 2008/08/14 20:04:33 cuizheng Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -946,10 +946,10 @@ Bit16u cdrom_boot();
 
 #endif // BX_ELTORITO_BOOT
 
-static char bios_cvs_version_string[] = "$Revision: 1.15 $";
-static char bios_date_string[] = "$Date: 2008/08/14 18:37:38 $";
+static char bios_cvs_version_string[] = "$Revision: 1.16 $";
+static char bios_date_string[] = "$Date: 2008/08/14 20:04:33 $";
 
-static char CVSID[] = "$Id: rombios.c,v 1.15 2008/08/14 18:37:38 cuizheng Exp $";
+static char CVSID[] = "$Id: rombios.c,v 1.16 2008/08/14 20:04:33 cuizheng Exp $";
 
 /* Offset to skip the CVS $Id: prefix */ 
 #define bios_version_string  (CVSID + 4)