Skip to contentSkip to conversation

softmmu/vl: Include "qemu/rcu.h" for rcu_disable_atfork()

PATCH In review Philippe Mathieu-Daudé 2 participants 3 messages Jul 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 softmmu/vl: Include "qemu/rcu.h" for rcu_disable_atfork()

In commit 73c6e4013b we let vl.c use rcu_disable_atfork() which is declared in "qemu/rcu.h", but forgot to include this header. Fortunately has never been a problem since vl.c includes "exec/memory.h" which includes "qemu/rcu.h".

Include the missing header now in case we split vl.c later.

Fixes 73c6e4013b ("rcu: disable pthread_atfork callbacks ASAP")
---
 softmmu/vl.c | 1 +
 1 file changed, 1 insertion(+)
softmmu/vl.c +1 -0
index ecbc18ba75..f243745c51 100644
@@ -83,6 +83,7 @@
 #include "qemu/config-file.h"
 #include "qemu-options.h"
 #include "qemu/main-loop.h"
+#include "qemu/rcu.h"
 #ifdef CONFIG_VIRTFS
 #include "fsdev/qemu-fsdev.h"
 #endif
Signature · 1 line
2.21.3
Reviewed-by on v1 1/1
#1 lore raw

If rcu.h should be explicitly included, should any of these other files that reference the rcu but do not explicitly #include qemu/rcu.h also get such includes?

util/qht.c
166: struct rcu_head rcu;

migration/savevm.c
1822: rcu_register_thread();

util/log.c
43: rcu_read_lock();

linux-user/syscall.c
6000: rcu_register_thread();

hw/virtio/virtio.c
74: struct rcu_head rcu;

target/arm/kvm.c
998: rcu_read_lock();

Quoted 29 lines · Philippe Mathieu-Daudé

In commit 73c6e4013b we let vl.c use rcu_disable_atfork() which is declared in "qemu/rcu.h", but forgot to include this header. Fortunately has never been a problem since vl.c includes "exec/memory.h" which includes "qemu/rcu.h".

Include the missing header now in case we split vl.c later.

Fixes 73c6e4013b ("rcu: disable pthread_atfork callbacks ASAP")
---
 softmmu/vl.c | 1 +
 1 file changed, 1 insertion(+)
softmmu/vl.c +1 -0
index ecbc18ba75..f243745c51 100644
@@ -83,6 +83,7 @@
 #include "qemu/config-file.h"
 #include "qemu-options.h"
 #include "qemu/main-loop.h"
+#include "qemu/rcu.h"
 #ifdef CONFIG_VIRTFS
 #include "fsdev/qemu-fsdev.h"
 #endif
Signature · 1 line
2.21.3
#2 lore raw
Quoted 5 lines · Alexander Bulekov

If rcu.h should be explicitly included, should any of these other files that reference the rcu but do not explicitly #include qemu/rcu.h also get such includes?

Personally I think so, yes.

Quoted 19 lines

util/qht.c
166: struct rcu_head rcu;

migration/savevm.c
1822: rcu_register_thread();

util/log.c
43: rcu_read_lock();

linux-user/syscall.c
6000: rcu_register_thread();

hw/virtio/virtio.c
74: struct rcu_head rcu;

target/arm/kvm.c
998: rcu_read_lock();