sys/linux/test: fix regression tests

This is a best-effort attempt to fix the tests passing ANY arguments
to the syz_kvm_add_vcpu$arm64() syscall.

3 files changed, 18 insertions, 3 deletions

diff --git a/sys/linux/test/arm64-kvm-bug367186827 b/sys/linux/test/arm64-kvm-bug367186827
index 12a692793..da6ceb1c7 100644
--- a/sys/linux/test/arm64-kvm-bug367186827
+++ b/sys/linux/test/arm64-kvm-bug367186827
@@ -9,7 +9,12 @@ ioctl$KVM_CREATE_VCPU(r2, 0xae41, 0x2)
 ioctl$KVM_IRQ_LINE(r2, 0x4008ae61, &(0x7f0000000240)={0x200002f, 0x0}) (async)
 r3 = ioctl$KVM_CREATE_VM(r0, 0xae01, 0x0)
 r4 = syz_kvm_setup_syzos_vm$arm64(r3, &(0x7f0000c00000/0x400000)=nil)
-r5 = syz_kvm_add_vcpu$arm64(r4, &(0x7f0000000080)={0x0, &(0x7f0000000000)=ANY=[@ANYBLOB="054c0f0000000060b47892001800000000003b67ed394d2d53cb"], 0x18}, 0x0, 0x0) (async, rerun: 64)
+#
+# The line used to look as follows, but syz_kvm_add_vcpu() does not support ANY anymore.
+# r5 = syz_kvm_add_vcpu$arm64(r4, &(0x7f0000000080)={0x0, &(0x7f0000000000)=ANY=[@ANYBLOB="054c0f0000000060b47892001800000000003b67ed394d2d53cb"], 0x18}, 0x0, 0x0) (async, rerun: 64)
+# Just replaced it with something relevant.
+#
+r5 = syz_kvm_add_vcpu$arm64(r4, &(0x7f0000000080)={0x0, &(0x7f0000000000)=[@irq_setup={0x5, 0x18, {0x1, 0x20}}], 0x18}, 0x0, 0x0) (async, rerun: 64)
 syz_kvm_vgic_v3_setup(r3, 0x1, 0x100)
 ioctl$KVM_RUN(r5, 0xae80, 0x0) (async)
 ioctl$KVM_IRQ_LINE(r3, 0x4008ae61, &(0x7f0000000100)={0x1000020, 0x1}) (async, rerun: 32)
diff --git a/sys/linux/test/arm64-kvm-bug370977056 b/sys/linux/test/arm64-kvm-bug370977056
index 4d0cfcdb1..fe000bd80 100644
--- a/sys/linux/test/arm64-kvm-bug370977056
+++ b/sys/linux/test/arm64-kvm-bug370977056
@@ -18,7 +18,12 @@ ioctl$KVM_IOEVENTFD(0xffffffffffffffff, 0x4040ae79, &(0x7f0000000100))
 r8 = ioctl$KVM_CREATE_VM(r0, 0xae01, 0x0)
 r9 = syz_kvm_setup_syzos_vm$arm64(r8, &(0x7f0000c00000/0x400000)=nil)
 r10 = syz_kvm_add_vcpu$arm64(r9, &(0x7f0000000080)={0x0, &(0x7f00000000c0)=[@irq_setup={0x5, 0x18, {0x1, 0x20}}], 0x18}, 0x0, 0x0) (async)
-r11 = syz_kvm_add_vcpu$arm64(r9, &(0x7f0000000100)={0x0, &(0x7f00000001c0)=ANY=[@ANYBLOB="050000"], 0x18}, 0x0, 0x0)
+#
+# The line used to look as follows, but syz_kvm_add_vcpu() does not support ANY anymore.
+# r11 = syz_kvm_add_vcpu$arm64(r9, &(0x7f0000000100)={0x0, &(0x7f00000001c0)=ANY=[@ANYBLOB="050000"], 0x18}, 0x0, 0x0)
+# Just replaced it with something relevant.
+#
+r11 = syz_kvm_add_vcpu$arm64(r9, &(0x7f0000000100)={0x0, &(0x7f00000001c0)=[@irq_setup={0x5, 0x18, {0x0, 0x0}}], 0x18}, 0x0, 0x0)
 syz_kvm_vgic_v3_setup(r8, 0x2, 0x100) (async)
 ioctl$KVM_RUN(r11, 0xae80, 0x0) (async)
 ioctl$KVM_RUN(r10, 0xae80, 0x0)
diff --git a/sys/linux/test/arm64-kvm-bug372635024 b/sys/linux/test/arm64-kvm-bug372635024
index 35ea607c9..cc247910e 100644
--- a/sys/linux/test/arm64-kvm-bug372635024
+++ b/sys/linux/test/arm64-kvm-bug372635024
@@ -4,7 +4,12 @@
 r0 = openat$kvm(0x0, &(0x7f0000000040), 0x0, 0x0)
 r1 = ioctl$KVM_CREATE_VM(r0, 0xae01, 0x0)
 r2 = syz_kvm_setup_syzos_vm$arm64(r1, &(0x7f0000c00000/0x400000)=nil)
-r3 = syz_kvm_add_vcpu$arm64(r2, &(0x7f0000000080)={0x0, &(0x7f0000000240)=ANY=[@ANYBLOB="05000000000000001800000000000000010000005002"], 0x18}, 0x0, 0x0)
+#
+# The line used to look as follows, but syz_kvm_add_vcpu() does not support ANY anymore.
+# r3 = syz_kvm_add_vcpu$arm64(r2, &(0x7f0000000080)={0x0, &(0x7f0000000240)=ANY=[@ANYBLOB="05000000000000001800000000000000010000005002"], 0x18}, 0x0, 0x0)
+# Just replaced it with something relevant.
+#
+r3 = syz_kvm_add_vcpu$arm64(r2, &(0x7f0000000080)={0x0, &(0x7f0000000240)=[@irq_setup={0x5, 0x18, {0x0, 0x0}}], 0x18}, 0x0, 0x0)
 ioctl$KVM_RUN(r3, 0xae80, 0x0)
 ioctl$KVM_SET_VCPU_EVENTS(r3, 0x4040aea0, &(0x7f0000000000)=@arm64={0x0, 0x1, 0xf, '\x00', 0xfffffffffffff105, ""})
 ioctl$KVM_RUN(r3, 0xae80, 0x0)