projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug fixes.
[pintos-anon]
/
src
/
utils
/
pintos
diff --git
a/src/utils/pintos
b/src/utils/pintos
index c48dc2405f1a92dccf10d954d7c469e0de405efb..9206629c0c801fe53249345de01bd12d66857528 100755
(executable)
--- a/
src/utils/pintos
+++ b/
src/utils/pintos
@@
-51,7
+51,7
@@
while (@ARGV) {
copy_pad ($hostfn, "scratch.dsk", 512);
# Do copy.
copy_pad ($hostfn, "scratch.dsk", 512);
# Do copy.
- run_vm ("-ci", $
ho
stfn, $size, "-q");
+ run_vm ("-ci", $
gue
stfn, $size, "-q");
exit 0;
} elsif ($arg eq 'get') {
usage () if @ARGV != 1 && @ARGV != 2;
exit 0;
} elsif ($arg eq 'get') {
usage () if @ARGV != 1 && @ARGV != 2;
@@
-172,8
+172,8
@@
sub run_vm {
print BOCHSRC "megs: $mem\n";
print BOCHSRC "log: bochsout.txt\n";
if ($vga ne 'terminal') {
print BOCHSRC "megs: $mem\n";
print BOCHSRC "log: bochsout.txt\n";
if ($vga ne 'terminal') {
- print BOCHSRC "com1: enabled=1, dev=/dev/
tty
\n"
- if $serial_
stdio
;
+ print BOCHSRC "com1: enabled=1, dev=/dev/
stdout
\n"
+ if $serial_
out
;
print BOCHSRC "display_library: nogui\n"
if $vga eq 'none';
} else {
print BOCHSRC "display_library: nogui\n"
if $vga eq 'none';
} else {
@@
-191,7
+191,7
@@
sub run_vm {
push (@cmd, '-hdd', $disks[3]) if defined $disks[3];
push (@cmd, '-m', $mem);
push (@cmd, '-nographic') if $vga eq 'none';
push (@cmd, '-hdd', $disks[3]) if defined $disks[3];
push (@cmd, '-m', $mem);
push (@cmd, '-nographic') if $vga eq 'none';
- push (@cmd, '-serial', 'stdio') if $serial_
stdio
&& $vga ne 'none';
+ push (@cmd, '-serial', 'stdio') if $serial_
out
&& $vga ne 'none';
push (@cmd, '-S') if $debug eq 'monitor';
push (@cmd, '-s') if $debug eq 'gdb';
run_command (@cmd);
push (@cmd, '-S') if $debug eq 'monitor';
push (@cmd, '-s') if $debug eq 'gdb';
run_command (@cmd);
@@
-284,7
+284,7
@@
sub bochs_disk_line {
return "" if !defined $file;
my (%geom) = disk_geometry ($file);
return "$device: type=disk, path=$file, mode=flat, "
return "" if !defined $file;
my (%geom) = disk_geometry ($file);
return "$device: type=disk, path=$file, mode=flat, "
- . "
cylinders=$geom{C}, heads=$geom{H}, spt=$geom{S}, "
+ . "cylinders=$geom{C}, heads=$geom{H}, spt=$geom{S}, "
. "translation=none\n";
}
. "translation=none\n";
}