public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* If $DISPLAY is set (i.e. in interactive mode), show QEMU's graphical

Browse Source 
output.

svn path=/nixos/trunk/; revision=25157
This commit is contained in:
Eelco Dolstra 2010-12-16 16:58:06 +00:00
parent 445827ad45
commit dac1936869
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/test-driver/Machine.pm
View File

@ -19,6 +19,8 @@ for (my $n = 0; $n < 256; $n++) {
$ENV{"QEMU_MCAST_ADDR_$n"} = "$mcastPrefix.$n.$mcastSuffix"; $ENV{"QEMU_MCAST_ADDR_$n"} = "$mcastPrefix.$n.$mcastSuffix";
} }
my $showGraphics = defined $ENV{'DISPLAY'};
sub new { sub new {
my ($class, $args) = @_; my ($class, $args) = @_;
@ -54,7 +56,7 @@ sub new {
pid => 0, pid => 0,
connected => 0, connected => 0,
socket => undef, socket => undef,
stateDir => "$tmpDir/$name", stateDir => "$tmpDir/vm-state-$name",
monitor => undef, monitor => undef,
}; };
@ -124,7 +126,9 @@ sub start {
dup2(fileno($serialC), fileno(STDERR)); dup2(fileno($serialC), fileno(STDERR));
$ENV{TMPDIR} = $self->{stateDir}; $ENV{TMPDIR} = $self->{stateDir};
$ENV{USE_TMPDIR} = 1; $ENV{USE_TMPDIR} = 1;
$ENV{QEMU_OPTS} = "-nographic -no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell"; $ENV{QEMU_OPTS} =
"-no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
($showGraphics ? "-serial stdio" : "-nographic");
$ENV{QEMU_NET_OPTS} = "guestfwd=tcp:10.0.2.6:23-chardev:shell"; $ENV{QEMU_NET_OPTS} = "guestfwd=tcp:10.0.2.6:23-chardev:shell";
$ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}"; $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
chdir $self->{stateDir} or die; chdir $self->{stateDir} or die;