diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2023-03-09 10:52:38 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-03-09 10:52:38 -0500 |
| commit | 8672804daa67855739592070e1732991179c2ba9 (patch) | |
| tree | 4b06bf140eb6a3be87eefdefb3f14ee40b8148d5 | |
| parent | 35650073624aadb1e7ebab5306f9c183fc369f8d (diff) | |
| download | xfstests-bld-8672804daa67855739592070e1732991179c2ba9.tar.gz | |
kvm-xfstests: allow specification of qemu machine type
For some reason, some large kernel configs generated by syzbot require
using the qemu machine type pc-q35-7.1. The qemu machtype pc-q35-7.2,
which is aliased to the machine type q35 on the version of qemu
currently installed in Debian testing, will hang without showing any
kernel messages on the serial config. The reason is unknown, but
allow the machine type to be specified by explicitly using the
--machtype command-line option. The line "KVM_MACHTYPE=pc-q35-7.1"
can also be specified in $HOME/.config/kvm-xfstests if desired.
Link: https://github.com/google/syzkaller/issues/3740#issuecomment-1460996684
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rwxr-xr-x | run-fstests/kvm-xfstests | 2 | ||||
| -rw-r--r-- | run-fstests/util/parse_cli | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/run-fstests/kvm-xfstests b/run-fstests/kvm-xfstests index 3830bc2d..43375d2e 100755 --- a/run-fstests/kvm-xfstests +++ b/run-fstests/kvm-xfstests @@ -188,7 +188,7 @@ case "$ARCH" in QEMU_ARCH=x86_64 ACCEL=kvm:tcg CONSOLE_DEV=ttyS0 - MACHINE_TYPE=q35 + MACHINE_TYPE=${KVM_MACHTYPE:-q35} CPU_TYPE=max ;; arm64) diff --git a/run-fstests/util/parse_cli b/run-fstests/util/parse_cli index 137b2b17..7b66fb32 100644 --- a/run-fstests/util/parse_cli +++ b/run-fstests/util/parse_cli @@ -542,8 +542,12 @@ while (( $# >= 1 )); do PMEM_DEVICE=yes ;; --machtype) shift - supported_flavors gce - GCE_MACHTYPE="$1" + supported_flavors gce kvm + if flavor_in gce ; then + GCE_MACHTYPE="$1" + else + KVM_MACHTYPE="$1" + fi ;; --image-project) shift supported_flavors gce |