From: Peter Dinda <pdinda@northwestern.edu>
Date: Mon, 7 Jul 2008 23:56:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: reaches-user-mode-on-qemu-and-both-amd-boxes-nested-paging-faults~14
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=bc2a0bcb7f0f3947a463d731ca0e6087806e605b

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

diff --git a/palacios/src/vmboot/rombios/rombios.c b/palacios/src/vmboot/rombios/rombios.c
index f8f4267..0b9f3da 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.10 2008/07/07 23:26:58 pdinda Exp $
+// $Id: rombios.c,v 1.11 2008/07/07 23:56:54 pdinda Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -945,10 +945,10 @@ Bit16u cdrom_boot();
 
 #endif // BX_ELTORITO_BOOT
 
-static char bios_cvs_version_string[] = "$Revision: 1.10 $";
-static char bios_date_string[] = "$Date: 2008/07/07 23:26:58 $";
+static char bios_cvs_version_string[] = "$Revision: 1.11 $";
+static char bios_date_string[] = "$Date: 2008/07/07 23:56:54 $";
 
-static char CVSID[] = "$Id: rombios.c,v 1.10 2008/07/07 23:26:58 pdinda Exp $";
+static char CVSID[] = "$Id: rombios.c,v 1.11 2008/07/07 23:56:54 pdinda Exp $";
 
 /* Offset to skip the CVS $Id: prefix */ 
 #define bios_version_string  (CVSID + 4)
@@ -3375,7 +3375,7 @@ cdrom_boot()
   atacmd[3]=(lba & 0x00ff0000) >> 16;
   atacmd[4]=(lba & 0x0000ff00) >> 8;
   atacmd[5]=(lba & 0x000000ff);
-  if((error = ata_cmd_packetdevice, 12, get_SS(), atacmd, 0, nbsectors*512L, ATA_DATA_IN, boot_segment,0)) != 0)
+  if((error = ata_cmd_packet(device, 12, get_SS(), atacmd, 0, nbsectors*512L, ATA_DATA_IN, boot_segment,0)) != 0)
     return 12;