[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/7] tests/qtest/fuzz: Remove legacy '-machine foo,accel=bar'
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 3/7] tests/qtest/fuzz: Remove legacy '-machine foo,accel=bar' |
Date: |
Tue, 3 Dec 2024 10:21:49 +0100 |
Since commit 6f6e1698a68 ("vl: configure accelerators from -accel
options") we prefer the '-accel bar' command line option.
Replace '-machine foo,accel=bar' -> '-machine foo -accel bar' in
fuzzer scripts and tests.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/qtest/fuzz/generic_fuzz.c | 2 +-
tests/qtest/fuzz/i440fx_fuzz.c | 2 +-
tests/qtest/fuzz/qos_fuzz.c | 2 +-
scripts/oss-fuzz/output_reproducer.py | 2 --
scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py | 6 +++---
5 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index d107a496da6..a8737a4c463 100644
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -919,7 +919,7 @@ static GString *generic_fuzz_cmdline(FuzzTarget *t)
usage();
}
g_string_append_printf(cmd_line, " -display none \
- -machine accel=qtest, \
+ -accel qtest \
-m 512M %s ", getenv("QEMU_FUZZ_ARGS"));
return cmd_line;
}
diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c
index 155fe018f80..b5487996625 100644
--- a/tests/qtest/fuzz/i440fx_fuzz.c
+++ b/tests/qtest/fuzz/i440fx_fuzz.c
@@ -145,7 +145,7 @@ static void i440fx_fuzz_qos(QTestState *s,
pciconfig_fuzz_qos(s, bus, Data, Size);
}
-static const char *i440fx_qtest_argv = TARGET_NAME " -machine accel=qtest"
+static const char *i440fx_qtest_argv = TARGET_NAME " -accel qtest"
" -m 0 -display none";
static GString *i440fx_argv(FuzzTarget *t)
{
diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index d3839bf9994..9267e63889d 100644
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -84,7 +84,7 @@ static GString *qos_build_main_args(void)
}
/* Prepend the arguments that we need */
g_string_prepend(cmd_line,
- TARGET_NAME " -display none -machine accel=qtest -m 64 ");
+ TARGET_NAME " -display none -accel qtest -m 64 ");
return cmd_line;
}
diff --git a/scripts/oss-fuzz/output_reproducer.py
b/scripts/oss-fuzz/output_reproducer.py
index e8ef76b3413..840da3b5a5b 100755
--- a/scripts/oss-fuzz/output_reproducer.py
+++ b/scripts/oss-fuzz/output_reproducer.py
@@ -64,8 +64,6 @@ def c_reproducer(name, args, trace):
# libqtest will add its own qtest args, so get rid of them
args = args.replace("-accel qtest","")
- args = args.replace(",accel=qtest","")
- args = args.replace("-machine accel=qtest","")
args = args.replace("-qtest stdio","")
result.append("""QTestState *s = qtest_init("{}");""".format(args))
for l in trace.splitlines():
diff --git a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
index b154a25508f..f3813944d3b 100755
--- a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
+++ b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
@@ -5,15 +5,15 @@
Use this to convert qtest log info from a generic fuzzer input into a qtest
trace that you can feed into a standard qemu-system process. Example usage:
-QEMU_FUZZ_ARGS="-machine q35,accel=qtest" QEMU_FUZZ_OBJECTS="*" \
+QEMU_FUZZ_ARGS="-machine q35 -accel qtest" QEMU_FUZZ_OBJECTS="*" \
./i386-softmmu/qemu-fuzz-i386 --fuzz-target=generic-pci-fuzz
# .. Finds some crash
QTEST_LOG=1 FUZZ_SERIALIZE_QTEST=1 \
-QEMU_FUZZ_ARGS="-machine q35,accel=qtest" QEMU_FUZZ_OBJECTS="*" \
+QEMU_FUZZ_ARGS="-machine q35 -accel qtest" QEMU_FUZZ_OBJECTS="*" \
./i386-softmmu/qemu-fuzz-i386 --fuzz-target=generic-pci-fuzz
/path/to/crash 2> qtest_log_output
scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py qtest_log_output > qtest_trace
-./i386-softmmu/qemu-fuzz-i386 -machine q35,accel=qtest \
+./i386-softmmu/qemu-fuzz-i386 -machine q35 -accel qtest \
-qtest stdio < qtest_trace
### Details ###
--
2.45.2
- [PATCH 0/7] cli: Remove mentions of legacy '-machine foo, accel=bar' command line, Philippe Mathieu-Daudé, 2024/12/03
- [PATCH 1/7] tests/functional/test_ppc64_hv: Remove legacy '-machine foo, accel=bar', Philippe Mathieu-Daudé, 2024/12/03
- [PATCH 2/7] tests/functional/test_virtio_gpu: Remove legacy '-machine foo, accel=bar', Philippe Mathieu-Daudé, 2024/12/03
- [PATCH 3/7] tests/qtest/fuzz: Remove legacy '-machine foo,accel=bar',
Philippe Mathieu-Daudé <=
- [PATCH 4/7] scripts/device-crash-test: Remove legacy '-machine foo, accel=bar', Philippe Mathieu-Daudé, 2024/12/03
- [PATCH 5/7] accel/tcg: Remove mentions of legacy '-machine foo, accel=bar', Philippe Mathieu-Daudé, 2024/12/03
- [PATCH 6/7] accel/kvm: Remove mentions of legacy '-machine foo, accel=bar', Philippe Mathieu-Daudé, 2024/12/03
- [PATCH 7/7] qemu-options: Remove mentions of legacy '-machine foo, accel=bar', Philippe Mathieu-Daudé, 2024/12/03