From: Daniel P. Berrangé Date: Fri, 29 Nov 2024 13:55:06 +0000 (+0000) Subject: tests/qtest: drop 'fuzz-' prefix from virtio-balloon test X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8460459529215e29c7f84efec69a329194ad4f87;p=qemu.git tests/qtest: drop 'fuzz-' prefix from virtio-balloon test This test file is expected to be extended for arbitrary virtio-balloon related tests, not merely those discovered by fuzzing. Signed-off-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Fabiano Rosas Message-ID: <20241129135507.699030-3-berrange@redhat.com> [PMD: Update MAINTAINERS] Signed-off-by: Philippe Mathieu-Daudé Acked-by: Michael S. Tsirkin --- diff --git a/MAINTAINERS b/MAINTAINERS index f92be04775..aaf0505a21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2228,6 +2228,7 @@ F: hw/virtio/virtio-balloon*.c F: include/hw/virtio/virtio-balloon.h F: system/balloon.c F: include/sysemu/balloon.h +F: tests/qtest/virtio-balloon-test.c virtio-9p M: Greg Kurz diff --git a/tests/qtest/fuzz-virtio-balloon-test.c b/tests/qtest/fuzz-virtio-balloon-test.c deleted file mode 100644 index ecb597fbee..0000000000 --- a/tests/qtest/fuzz-virtio-balloon-test.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * QTest fuzzer-generated testcase for virtio balloon device - * - * Copyright (c) 2024 Gao Shiyuan - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "qemu/osdep.h" -#include "libqtest.h" - -/* - * https://gitlab.com/qemu-project/qemu/-/issues/2576 - * Used to trigger: - * virtio_address_space_lookup: Assertion `mrs.mr' failed. - */ -static void oss_fuzz_71649(void) -{ - QTestState *s = qtest_init("-device virtio-balloon -machine q35" - " -nodefaults"); - - qtest_outl(s, 0xcf8, 0x80000890); - qtest_outl(s, 0xcfc, 0x2); - qtest_outl(s, 0xcf8, 0x80000891); - qtest_inl(s, 0xcfc); - qtest_quit(s); -} - -int main(int argc, char **argv) -{ - g_test_init(&argc, &argv, NULL); - - qtest_add_func("fuzz/virtio/oss_fuzz_71649", oss_fuzz_71649); - - return g_test_run(); -} - diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index f2f35367ae..bd41c9da5f 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -88,7 +88,7 @@ qtests_i386 = \ (config_all_devices.has_key('CONFIG_MEGASAS_SCSI_PCI') ? ['fuzz-megasas-test'] : []) + \ (config_all_devices.has_key('CONFIG_LSI_SCSI_PCI') ? ['fuzz-lsi53c895a-test'] : []) + \ (config_all_devices.has_key('CONFIG_VIRTIO_SCSI') ? ['fuzz-virtio-scsi-test'] : []) + \ - (config_all_devices.has_key('CONFIG_VIRTIO_BALLOON') ? ['fuzz-virtio-balloon-test'] : []) + \ + (config_all_devices.has_key('CONFIG_VIRTIO_BALLOON') ? ['virtio-balloon-test'] : []) + \ (config_all_devices.has_key('CONFIG_Q35') ? ['q35-test'] : []) + \ (config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []) + \ (config_all_devices.has_key('CONFIG_SDHCI_PCI') ? ['fuzz-sdcard-test'] : []) + \ diff --git a/tests/qtest/virtio-balloon-test.c b/tests/qtest/virtio-balloon-test.c new file mode 100644 index 0000000000..6bea33b590 --- /dev/null +++ b/tests/qtest/virtio-balloon-test.c @@ -0,0 +1,37 @@ +/* + * QTest test cases for virtio balloon device + * + * Copyright (c) 2024 Gao Shiyuan + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "libqtest.h" + +/* + * https://gitlab.com/qemu-project/qemu/-/issues/2576 + * Used to trigger: + * virtio_address_space_lookup: Assertion `mrs.mr' failed. + */ +static void oss_fuzz_71649(void) +{ + QTestState *s = qtest_init("-device virtio-balloon -machine q35" + " -nodefaults"); + + qtest_outl(s, 0xcf8, 0x80000890); + qtest_outl(s, 0xcfc, 0x2); + qtest_outl(s, 0xcf8, 0x80000891); + qtest_inl(s, 0xcfc); + qtest_quit(s); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + + qtest_add_func("virtio-balloon/oss_fuzz_71649", oss_fuzz_71649); + + return g_test_run(); +} +