Always make the scratch disk an even multiple of a cylinder in size.

[pintos-anon] / src / utils / pintos

diff --git a/src/utils/pintos b/src/utils/pintos
index 0b48be11ed64af5d79e15f55617b9385eaa96fef..fca610a15c83d6c4cdd1e80062d04b1812f5d1f8 100755 (executable)
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -259,7 +259,8 @@ sub prepare_scratch_disk {
          foreach @puts;
 
        # Write end-of-archive marker.
-       print { $disks{SCRATCH}{HANDLE} } "\0" x 1024;
+       write_fully ($disks{SCRATCH}{HANDLE}, $disks{SCRATCH}{FILE_NAME},
+                    "\0" x 1024);
     }
 
     # Make sure the scratch disk is big enough to get big files.
@@ -472,7 +473,7 @@ sub run_bochs {
     # Write bochsrc.txt configuration file.
     open (BOCHSRC, ">", "bochsrc.txt") or die "bochsrc.txt: create: $!\n";
     print BOCHSRC <<EOF;
-romimage: file=\$BXSHARE/BIOS-bochs-latest, address=0xf0000
+romimage: file=\$BXSHARE/BIOS-bochs-latest
 vgaromimage: file=\$BXSHARE/VGABIOS-lgpl-latest
 boot: disk
 cpu: ips=1000000