diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-26 01:28:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 01:28:12 +0200 |
| commit | b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65 (patch) | |
| tree | 5a167f9cad44fc5f071f93911143ae08d87f9946 /nixos | |
| parent | c429c9a8bb92ce5cb3a81a518e4c1505725c12d8 (diff) | |
| parent | 341250fa10e07f50a2700fe18465bb91900c851d (diff) | |
| download | nixpkgs-b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65.tar nixpkgs-b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65.tar.gz nixpkgs-b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65.tar.bz2 nixpkgs-b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65.tar.lz nixpkgs-b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65.tar.xz nixpkgs-b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65.tar.zst nixpkgs-b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65.zip | |
Merge pull request #43736 from volth/patch-208
qemu: 2.12.1 -> 3.0.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/qemu-flags.nix | 8 | ||||
| -rw-r--r-- | nixos/tests/ec2.nix | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index 6f61c64a832..f115ca5ac00 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -1,11 +1,15 @@ # QEMU flags shared between various Nix expressions. { pkgs }: +let + zeroPad = n: if n < 10 then "0${toString n}" else toString n; +in + { qemuNICFlags = nic: net: machine: - [ "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio" - "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" + [ "-device virtio-net-pci,netdev=vlan${toString nic},mac=52:54:00:12:${zeroPad net}:${zeroPad machine}" + "-netdev vde,id=vlan${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index f585fa2ec23..8271747ccc6 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -68,7 +68,9 @@ let # again when it deletes link-local addresses.) Ideally we'd # turn off the DHCP server, but qemu does not have an option # to do that. - my $startCommand = "qemu-kvm -m 768 -net nic,vlan=0,model=virtio -net 'user,vlan=0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; + my $startCommand = "qemu-kvm -m 768"; + $startCommand .= " -device virtio-net-pci,netdev=vlan0"; + $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; $startCommand .= " -drive file=$diskImage,if=virtio,werror=report"; $startCommand .= " \$QEMU_OPTS"; |