aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Egorenov <eaibmz@gmail.com>2022-10-27 06:50:57 +0200
committerDmitry Vyukov <dvyukov@google.com>2022-11-14 10:41:37 +0100
commit943f4cb8411ec16e466b0bb48bd6bcdbc526f442 (patch)
tree8747fe983332d4a540da16fa3018681db7d90a5e
parent7ba4d8599e4d96a8c2deb0f5a61cfc75eaeadcd8 (diff)
vm/qemu: prevent network device renaming on s390x arch
This is a temporary work-around for s390x until it supports CONFIG_CMDLINE. Failing to do so might cause a failure to establish a SSH connection when syz-ci tests a built image. syz-ci output: -------------- building kernel... testing image... VM boot failed with: can't ssh into the instance failure log: ------------ failed to run ["ssh" "-p" "34490" ... "root@localhost" "pwd"]: exit status 255 Connection timed out during banner exchange Connection to 127.0.0.1 port 34490 timed out qemu dmesg ---------- [ 6.646475] virtio_net virtio0 eno1: renamed from eth0 Signed-off-by: Alexander Egorenov <eaibmz@gmail.com>
-rw-r--r--vm/qemu/qemu.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go
index defd1a970..d9933fa05 100644
--- a/vm/qemu/qemu.go
+++ b/vm/qemu/qemu.go
@@ -200,6 +200,10 @@ var archConfigs = map[string]*archConfig{
RngDev: "virtio-rng-ccw",
CmdLine: []string{
"root=/dev/vda",
+ // The following kernel parameters is a temporary
+ // work-around for not having CONFIG_CMDLINE on s390x.
+ "net.ifnames=0",
+ "biosdevname=0",
},
},
"freebsd/amd64": {