Call qemu with "-nics 0" to avoid calling any network initialization

[pintos-anon] / src / utils / pintos

diff --git a/src/utils/pintos b/src/utils/pintos
index 8721db313042bb35438dd1cf20856aa0f816c7e2..fd5078e387a132698ae72fac0e2607fbf33e7e2c 100755 (executable)
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -19,7 +19,7 @@ our (@puts);                  # Files to copy into the VM.
 our (@gets);                   # Files to copy out of the VM.
 our ($as_ref);                 # Reference to last addition to @gets or @puts.
 our (@kernel_args);            # Arguments to pass to kernel.
-our (%disks) = (OS => {FILENAME => 'os.dsk'},          # Disks to give VM.
+our (%disks) = (OS => {DEF_FN => 'os.dsk'},            # Disks to give VM.
                FS => {DEF_FN => 'fs.dsk'},
                SCRATCH => {DEF_FN => 'scratch.dsk'},
                SWAP => {DEF_FN => 'swap.dsk'});
@@ -193,9 +193,13 @@ sub set_as {
 sub find_disks {
     for my $disk (values %disks) {
        # If there's no assigned file name but the default file exists,
-       # assign the default file.
-       $disk->{FILENAME} = $disk->{DEF_FN}
-         if !defined ($disk->{FILENAME}) && -e $disk->{DEF_FN};
+       # try to assign a default file name.
+       if (!defined ($disk->{FILENAME})) {
+           for my $try_fn ($disk->{DEF_FN}, "build/" . $disk->{DEF_FN}) {
+               $disk->{FILENAME} = $try_fn, last
+                 if -e $try_fn;
+           }
+       }
 
        # If there's no file name, we're done.
        next if !defined ($disk->{FILENAME});
@@ -220,6 +224,7 @@ sub find_disks {
     }
 
     # Warn about (potentially) missing disks.
+    die "Cannot find OS disk\n" if !defined $disks{OS}{FILENAME};
     if (my ($project) = `pwd` =~ /\b(threads|userprog|vm|filesys)\b/) {
        if ((grep ($project eq $_, qw (userprog vm filesys)))
            && !defined ($disks{FS}{FILENAME})) {
@@ -441,7 +446,7 @@ sub run_qemu {
        push (@cmd, $option, $disks_by_iface[$iface]{FILENAME})
          if defined $disks_by_iface[$iface]{FILENAME};
     }
-    push (@cmd, '-m', $mem);
+    push (@cmd, '-m', $mem, '-nics', '0');
     push (@cmd, '-nographic') if $vga eq 'none';
     push (@cmd, '-serial', 'stdio') if $serial_out && $vga ne 'none';
     push (@cmd, '-S') if $debug eq 'monitor';
@@ -682,10 +687,12 @@ sub relay_signal {
 # Interrupts $pid and dies with a timeout error message.
 sub timeout {
     my ($pid) = @_;
-    relay_signal ($pid, "INT");
+    kill "INT", $pid;
+    waitpid ($pid, 0);
+    seek (STDOUT, 0, 2);
     my ($load_avg) = `uptime` =~ /(load average:.*)$/i;
-    print "TIMEOUT after $timeout seconds";
+    print "\nTIMEOUT after $timeout seconds";
     print  " - $load_avg" if defined $load_avg;
     print "\n";
-    exit (2);
+    exit 0;
 }