diff options
author | Andrew Childs <lorne@cons.org.nz> | 2019-07-21 14:07:37 +0900 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2019-07-22 13:44:27 +0300 |
commit | d2144755a41be5e6c866686aabbfb0d4dd79392c (patch) | |
tree | 459d660c4a8b0f1cc241f6f14703ab2f9665b8e6 /nixos/lib | |
parent | b93b7d292ab6794b4b453b8476f5e25d3506fd09 (diff) | |
download | nixlib-d2144755a41be5e6c866686aabbfb0d4dd79392c.tar nixlib-d2144755a41be5e6c866686aabbfb0d4dd79392c.tar.gz nixlib-d2144755a41be5e6c866686aabbfb0d4dd79392c.tar.bz2 nixlib-d2144755a41be5e6c866686aabbfb0d4dd79392c.tar.lz nixlib-d2144755a41be5e6c866686aabbfb0d4dd79392c.tar.xz nixlib-d2144755a41be5e6c866686aabbfb0d4dd79392c.tar.zst nixlib-d2144755a41be5e6c866686aabbfb0d4dd79392c.zip |
nixos-test-driver: allow configuration of net frontend and backend
When IPXE tests were added, an option was added for configuring only the frontend, and the backend configuration was dropped entirely. This caused most installer tests to fail.
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/test-driver/Machine.pm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 5e4c14e749fd..4d3d63cd2dbf 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -31,12 +31,17 @@ sub new { if (!$startCommand) { # !!! merge with qemu-vm.nix. - my $netArgs = ""; - $netArgs .= ",romfile=$args->{netRomFile}" - if defined $args->{netRomFile}; + 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 " . - "-device virtio-net-pci,netdev=net0${netArgs} \$QEMU_OPTS "; + "qemu-kvm -m 384 $netBackend $netFrontend \$QEMU_OPTS "; if (defined $args->{hda}) { if ($args->{hdaInterface} eq "scsi") { |