Disable networking when running qemu,

[pintos-anon] / src / utils / pintos

diff --git a/src/utils/pintos b/src/utils/pintos
index 19ef70f650954680a8507bad26e5364c2e8ec226..f0ab60c25d717c424a48dda0cc3e29cd79328083 100755 (executable)
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -8,7 +8,7 @@ use Getopt::Long qw(:config bundling);
 
 # Command-line options.
 our ($start_time) = time ();
-our ($sim) = $ENV{PINTOSSIM};  # Simulator: bochs, qemu, or gsx.
+our ($sim);                    # Simulator: bochs, qemu, or gsx.
 our ($debug) = "none";         # Debugger: none, monitor, or gdb.
 our ($mem) = 4;                        # Physical RAM in MB.
 our ($serial_out) = 1;         # Send output to serial port?
@@ -130,8 +130,6 @@ Disk options: (name an existing FILE or specify SIZE in MB for a temp disk)
   --swap-disk=FILE|SIZE    Set swap disk file (default: swap.dsk)
 Other options:
   -h, --help               Display this help message.
-Environment variables:
-  PINTOSSIM                Select default simulator.
 EOF
     exit $exitcode;
 }
@@ -450,6 +448,7 @@ sub run_qemu {
          if defined $disks_by_iface[$iface]{FILE_NAME};
     }
     push (@cmd, '-m', $mem);
+    push (@cmd, '-net', 'none');
     push (@cmd, '-nographic') if $vga eq 'none';
     push (@cmd, '-serial', 'stdio') if $serial_out && $vga ne 'none';
     push (@cmd, '-S') if $debug eq 'monitor';