diff options
| author | Danylo Hlynskyi <abcz2.uprola@gmail.com> | 2019-08-05 14:09:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 14:09:28 +0300 |
| commit | 7585496effbf7fe7815265c2211e8745a90d3136 (patch) | |
| tree | 38eda227ff9b4ef2c467388a6a399d4daf929b06 /nixos/lib | |
| parent | d0413360d3a6c51dc56d4ce0ab07ad4678a83ada (diff) | |
| parent | 4e795680bef5fb8740442451496f890c301d8592 (diff) | |
Merge branch 'master' into flip-map-foreach
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/test-driver/Machine.pm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 006da889671..4d3d63cd2db 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -31,9 +31,17 @@ sub new { if (!$startCommand) { # !!! merge with qemu-vm.nix. + my $netBackend = "-netdev user,id=net0"; + my $netFrontend = "-device virtio-net-pci,netdev=net0"; + + $netBackend .= "," . $args->{netBackendArgs} + if defined $args->{netBackendArgs}; + + $netFrontend .= "," . $args->{netFrontendArgs} + if defined $args->{netFrontendArgs}; + $startCommand = - "qemu-kvm -m 384 " . - "-net nic,model=virtio \$QEMU_OPTS "; + "qemu-kvm -m 384 $netBackend $netFrontend \$QEMU_OPTS "; if (defined $args->{hda}) { if ($args->{hdaInterface} eq "scsi") { |