our ($jitter);
use Getopt::Long qw(:config require_order bundling);
-GetOptions ("bochs|qemu|gsx" => \&set_sim,
- "no-debug|monitor|gdb" => \&set_debug,
+GetOptions ("sim=s" => sub { set_sim (@_) },
+ "bochs" => sub { set_sim ("bochs") },
+ "qemu" => sub { set_sim ("qemu") },
+ "gsx" => sub { set_sim ("gsx") },
+
+ "debug=s" => sub { set_debug (@_) },
+ "no-debug" => sub { set_debug ("no-debug") },
+ "monitor" => sub { set_debug ("monitor") },
+ "gdb" => sub { set_debug ("gdb") },
+
"run|get|put|make-disk" => \&cmd_option,
+
"m|memory=i" => \$mem,
"j|jitter=i" => \$jitter,
+
"v|no-vga" => sub { set_vga ('none'); },
"s|no-serial" => sub { $serial_out = 0; },
"t|terminal" => sub { set_vga ('terminal'); },
+
"h|help" => sub { usage (0); },
+
"0|os-disk|disk-0|hda=s" => \$disks[0],
"1|fs-disk|disk-1|hdb=s" => \$disks[1],
"2|scratch-disk|disk-2|hdc=s" => \$disks[2],
$vga = "window" if !defined $vga;
sub set_sim {
- my ($option) = @_;
- die "--$option conflicts with --$sim\n" if defined $sim;
- our ($sim) = $option;
+ my ($new_sim) = @_;
+ die "--$new_sim conflicts with --$sim\n"
+ if defined ($sim) && $sim ne $new_sim;
+ $sim = $new_sim;
}
sub set_debug {
- my ($option) = @_;
- die "--$option conflicts with --$debug\n" if defined $debug;
- our ($debug) = $option;
+ my ($new_debug) = @_;
+ die "--$new_debug conflicts with --$debug\n"
+ if defined ($debug) && $debug ne $new_debug;
+ $debug = $new_debug;
}
sub set_vga {
if (defined ($vga) && $vga ne $new_vga) {
print "warning: conflicting vga display options\n";
}
- our ($vga) = $new_vga;
+ $vga = $new_vga;
}
sub cmd_option {
- our ($cmd) = @_;
-
# Force an end to option processing, as with --.
die ("!FINISH");
}
if @ARGV < 1;
my ($cmd) = shift @ARGV;
if ($cmd eq 'run') {
- run_vm (@ARGV);
+ run_vm ('EXEC', @ARGV);
} elsif ($cmd eq 'make-disk') {
usage () if @ARGV != 2;
my ($file, $mb) = @ARGV;
create_disk ($file, int ($mb * 1008));
} elsif ($cmd eq 'put') {
+ # Take a -f option to combine formatting with putting.
+ my ($format) = 0;
+ if (@ARGV > 0 && $ARGV[0] eq '-f') {
+ shift @ARGV;
+ $format = 1;
+ }
+
usage () if @ARGV != 1 && @ARGV != 2;
my ($hostfn, $guestfn) = @ARGV;
$guestfn = $hostfn if !defined $guestfn;
copy_pad ($hostfn, "scratch.dsk", 512);
# Do copy.
- run_vm ("-ci", $guestfn, $size, "-q");
+ my (@cmd) = ("-ci", $guestfn, $size, "-q");
+ unshift (@cmd, "-f") if $format;
+ run_vm ('EXEC', @cmd);
} elsif ($cmd eq 'get') {
usage () if @ARGV != 1 && @ARGV != 2;
my ($guestfn, $hostfn) = @ARGV;
# Create scratch disk big enough for any file in the filesystem
# (modulo sparse files).
- die "fs.dsk: $!\n" if ! -e "fs.dsk";
+ die "$disks[1]: $!\n" if ! -e $disks[1];
my ($fs_size) = -s _;
- my ($scratch_size) = -s "scratch.dsk";
+ my ($scratch_size) = -s $disks[2];
$scratch_size = 0 if !defined $scratch_size;
- create_disk ("scratch.dsk", $fs_size / 1024 + 16)
+ create_disk ($disks[2], $fs_size / 1024 + 16)
if $scratch_size < $fs_size + 16384;
# Do copy.
- run_vm ("-co", $guestfn, "-q");
+ run_vm ('FORK', "-co", $guestfn, "-q");
# Read out scratch disk.
- print "copying $guestfn from scratch.dsk to $hostfn...\n";
- open (SRC, "<scratch.dsk") or die "scratch.dsk: open: $!\n";
+ print "copying $guestfn from $disks[2] to $hostfn...\n";
+ open (SRC, "<$disks[2]") or die "$disks[2]: open: $!\n";
open (DST, ">$hostfn") or die "$hostfn: create: $!\n";
my ($input);
- read (SRC, $input, 512) == 512 or die "scratch.dsk: read error\n";
- my ($size) = unpack ("%V", $input);
- $size != 0xffffffff or die "$guestfn: too big for scratch.dsk?";
+ read (SRC, $input, 512) == 512 or die "$disks[2]: read error\n";
+ my ($size) = unpack ("V", $input);
+ $size != 0xffffffff or die "$guestfn: too big for $disks[2]?";
my ($src);
- read (SRC, $src, $size) == $size or die "scratch.dsk: read error\n";
+ read (SRC, $src, $size) == $size or die "$disks[2]: read error\n";
print DST $src or die "$hostfn: write error\n";
close (DST);
close (SRC);
}
sub run_vm {
+ my ($fork) = shift;
+ $fork eq 'FORK' || $fork eq 'EXEC' or die;
+
our (@disks);
die "$disks[0]: can't find OS disk\n" if ! -e $disks[0];
my (@cmd) = ($bin, '-q');
push (@cmd, '-j', $jitter) if defined $jitter;
- run_command_no_die (@cmd);
+ print join (' ', @cmd), "\n";
+ $fork eq 'EXEC' ? exec (@cmd) : system (@cmd);
} elsif ($sim eq 'qemu') {
print "warning: qemu doesn't support --terminal\n"
if $vga eq 'terminal';
die "command failed\n" if system (@_);
}
-sub run_command_no_die {
- print join (' ', @_), "\n";
- system (@_);
-}
-
sub search_path {
my ($target) = @_;
for my $dir (split (':', $ENV{PATH})) {