Enable ata1 under Bochs if hdc or hdd is needed.

[pintos-anon] / src / utils / pintos

diff --git a/src/utils/pintos b/src/utils/pintos
index c48dc2405f1a92dccf10d954d7c469e0de405efb..a2168d225dc5405c1eea49bcb3e731f29f096f7c 100755 (executable)
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -51,7 +51,7 @@ while (@ARGV) {
        copy_pad ($hostfn, "scratch.dsk", 512);
 
        # Do copy.
-       run_vm ("-ci", $hostfn, $size, "-q");
+       run_vm ("-ci", $guestfn, $size, "-q");
        exit 0;
     } elsif ($arg eq 'get') {
        usage () if @ARGV != 1 && @ARGV != 2;
@@ -164,6 +164,8 @@ sub run_vm {
        print BOCHSRC "vgaromimage: $vgaromimage\n";
        print BOCHSRC bochs_disk_line ("ata0-master", $disks[0]);
        print BOCHSRC bochs_disk_line ("ata0-slave", $disks[1]);
+       print BOCHSRC "ata1: enabled=1, ioaddr1=0x170, ioaddr2=0x370, irq=15\n"
+           if defined ($disks[2]) || defined ($disks[3]);
        print BOCHSRC bochs_disk_line ("ata1-master", $disks[2]);
        print BOCHSRC bochs_disk_line ("ata1-slave", $disks[3]);
        print BOCHSRC "boot: c\n";
@@ -172,8 +174,8 @@ sub run_vm {
        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 {
@@ -191,7 +193,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, '-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);
@@ -284,7 +286,7 @@ sub bochs_disk_line {
     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";
 }