diff options
| author | bors <bors@rust-lang.org> | 2021-02-02 06:23:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-02 06:23:10 +0000 |
| commit | d60b29d1ae8147538b8d542f7ffcc03b48e2cbda (patch) | |
| tree | 6a76c169dff88ac701c3bb5166a3b7c5923d06b3 /src/tools | |
| parent | c196b59f7db759028b0684443bcb35c124686c35 (diff) | |
| parent | 3f46fbf31b10cd93dd95d761eece38eb0864e69c (diff) | |
| download | rust-d60b29d1ae8147538b8d542f7ffcc03b48e2cbda.tar.gz rust-d60b29d1ae8147538b8d542f7ffcc03b48e2cbda.zip | |
Auto merge of #81539 - nikic:update-armhf-gnu, r=sanxiyn
Update armhf-gnu to Ubuntu 20.04 This requires updating the used Linux kernel to avoid an assembler error, the used busybox version to avoid a linker error, the used rootfs to match the host version and the qemu flags to work with the newer version. r? `@Mark-Simulacrum`
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/remote-test-client/src/main.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/remote-test-client/src/main.rs b/src/tools/remote-test-client/src/main.rs index 6245b76fd6e..2d99f2cb8e2 100644 --- a/src/tools/remote-test-client/src/main.rs +++ b/src/tools/remote-test-client/src/main.rs @@ -185,8 +185,10 @@ fn start_qemu_emulator(target: &str, rootfs: &Path, server: &Path, tmpdir: &Path .arg("-append") .arg("console=ttyAMA0 root=/dev/ram rdinit=/sbin/init init=/sbin/init") .arg("-nographic") - .arg("-redir") - .arg("tcp:12345::12345"); + .arg("-netdev") + .arg("user,id=net0,hostfwd=tcp::12345-:12345") + .arg("-device") + .arg("virtio-net-device,netdev=net0,mac=00:00:00:00:00:00"); t!(cmd.spawn()); } "aarch64-unknown-linux-gnu" => { |