aboutsummaryrefslogtreecommitdiff
path: root/softmmu/vl.c
diff options
context:
space:
mode:
authorAlexander Bulekov <alxndr@bu.edu>2020-06-18 12:05:16 -0400
committerThomas Huth <thuth@redhat.com>2020-07-06 07:37:02 +0200
commit45222b9a9016488289a1938a528239c3b83eddb1 (patch)
tree322669ece58bf6a7bea4192a109a854989f8d3fe /softmmu/vl.c
parenteb6490f544388dd24c0d054a96dd304bc7284450 (diff)
fuzz: fix broken qtest check at rcu_disable_atfork
The qtest_enabled check introduced in d6919e4 always returns false, as it is called prior to configure_accelerators(). Instead of trying to skip rcu_disable_atfork in qemu_main, simply call rcu_enable_atfork in the fuzzer, after qemu_main returns. Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alexander Bulekov <alxndr@bu.edu> Message-Id: <20200618160516.2817-1-alxndr@bu.edu> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'softmmu/vl.c')
-rw-r--r--softmmu/vl.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 3e15ee2435..9da2e23144 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3832,17 +3832,7 @@ void qemu_init(int argc, char **argv, char **envp)
machine_class);
os_daemonize();
-
- /*
- * If QTest is enabled, keep the rcu_atfork enabled, since system processes
- * may be forked testing purposes (e.g. fork-server based fuzzing) The fork
- * should happen before a signle cpu instruction is executed, to prevent
- * deadlocks. See commit 73c6e40, rcu: "completely disable pthread_atfork
- * callbacks as soon as possible"
- */
- if (!qtest_enabled()) {
- rcu_disable_atfork();
- }
+ rcu_disable_atfork();
if (pid_file && !qemu_write_pidfile(pid_file, &err)) {
error_reportf_err(err, "cannot create PID file: ");