[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 18/21] move blocking of signals to qemu_signalfd
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] Re: [PATCH 18/21] move blocking of signals to qemu_signalfd_init |
Date: |
Mon, 21 Feb 2011 11:12:03 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
On 2011-02-21 09:43, Paolo Bonzini wrote:
> This makes it easier to add a Win32 stub. The patch does that, too.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> cpus.c | 87 ++++++++++++++++++++++++++-------------------------------------
> 1 files changed, 36 insertions(+), 51 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index 1b6893d..5bb95d8 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -346,11 +346,37 @@ static void sigfd_handler(void *opaque)
> }
> }
>
> -static int qemu_signalfd_init(sigset_t mask)
> +static int qemu_signalfd_init(void)
> {
> int sigfd;
> + sigset_t set;
>
> - sigfd = qemu_signalfd(&mask);
> +#ifdef CONFIG_IOTHREAD
> + /* SIGUSR2 used by posix-aio-compat.c */
> + sigemptyset(&set);
> + sigaddset(&set, SIGUSR2);
> + pthread_sigmask(SIG_UNBLOCK, &set, NULL);
These lines are actually not related to signalfd setup. So you may want
to rename this function or move everything that does not block signals
and then pass the very same set to qemu_signalfd elsewhere.
> +
> + sigemptyset(&set);
> + sigaddset(&set, SIGIO);
> + sigaddset(&set, SIGALRM);
> + sigaddset(&set, SIG_IPI);
> + sigaddset(&set, SIGBUS);
> + pthread_sigmask(SIG_BLOCK, &set, NULL);
> +#else
> + sigemptyset(&set);
> + sigaddset(&set, SIGBUS);
> + if (kvm_enabled()) {
> + /*
> + * We need to process timer signals synchronously to avoid a race
> + * between exit_request check and KVM vcpu entry.
> + */
> + sigaddset(&set, SIGIO);
> + sigaddset(&set, SIGALRM);
> + }
> +#endif
> +
> + sigfd = qemu_signalfd(&set);
> if (sigfd == -1) {
> fprintf(stderr, "failed to create signalfd\n");
> return -errno;
> @@ -438,6 +464,12 @@ static void qemu_event_increment(void)
> static void qemu_kvm_eat_signals(CPUState *env)
> {
> }
> +
> +static int qemu_signalfd_init(void)
> +{
> + return 0;
> +}
> +
> #endif /* _WIN32 */
>
> #ifndef CONFIG_IOTHREAD
> @@ -471,39 +503,14 @@ static void qemu_kvm_init_cpu_signals(CPUState *env)
> #endif
> }
>
> -#ifndef _WIN32
> -static sigset_t block_synchronous_signals(void)
> -{
> - sigset_t set;
> -
> - sigemptyset(&set);
> - sigaddset(&set, SIGBUS);
> - if (kvm_enabled()) {
> - /*
> - * We need to process timer signals synchronously to avoid a race
> - * between exit_request check and KVM vcpu entry.
> - */
> - sigaddset(&set, SIGIO);
> - sigaddset(&set, SIGALRM);
> - }
> -
> - return set;
> -}
> -#endif
> -
> int qemu_init_main_loop(void)
> {
> -#ifndef _WIN32
> - sigset_t blocked_signals;
> int ret;
>
> - blocked_signals = block_synchronous_signals();
> -
> - ret = qemu_signalfd_init(blocked_signals);
> + ret = qemu_signalfd_init();
> if (ret) {
> return ret;
> }
> -#endif
>
> qemu_init_sigbus();
>
> @@ -651,35 +658,13 @@ static void qemu_tcg_init_cpu_signals(void)
> pthread_sigmask(SIG_UNBLOCK, &set, NULL);
> }
>
> -static sigset_t block_io_signals(void)
> -{
> - sigset_t set;
> -
> - /* SIGUSR2 used by posix-aio-compat.c */
> - sigemptyset(&set);
> - sigaddset(&set, SIGUSR2);
> - pthread_sigmask(SIG_UNBLOCK, &set, NULL);
> -
> - sigemptyset(&set);
> - sigaddset(&set, SIGIO);
> - sigaddset(&set, SIGALRM);
> - sigaddset(&set, SIG_IPI);
> - sigaddset(&set, SIGBUS);
> - pthread_sigmask(SIG_BLOCK, &set, NULL);
> -
> - return set;
> -}
> -
> int qemu_init_main_loop(void)
> {
> int ret;
> - sigset_t blocked_signals;
>
> qemu_init_sigbus();
>
> - blocked_signals = block_io_signals();
> -
> - ret = qemu_signalfd_init(blocked_signals);
> + ret = qemu_signalfd_init();
> if (ret) {
> return ret;
> }
For consistency reasons, you should also refactor the !IOTHREAD case.
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
- [Qemu-devel] [PATCH 11/21] exit round-robin vcpu loop if cpu->stopped is true, (continued)
- [Qemu-devel] [PATCH 11/21] exit round-robin vcpu loop if cpu->stopped is true, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 12/21] always signal pause_cond after stopping a VCPU, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 13/21] do not use timedwait on qemu_halt_cond, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 10/21] always qemu_cpu_kick after unhalting a cpu, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 14/21] do not use timedwait on qemu_system_cond, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 15/21] do not use timedwait on qemu_pause_cond, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 17/21] iothread stops the vcpu thread via IPI, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 16/21] do not use timedwait on qemu_cpu_cond, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 18/21] move blocking of signals to qemu_signalfd_init, Paolo Bonzini, 2011/02/21
- [Qemu-devel] Re: [PATCH 18/21] move blocking of signals to qemu_signalfd_init,
Jan Kiszka <=
- [Qemu-devel] [PATCH 19/21] provide dummy signal init functions for win32, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 20/21] protect qemu_cpu_kick_self for Win32, Paolo Bonzini, 2011/02/21
- [Qemu-devel] [PATCH 21/21] add Win32 IPI service, Paolo Bonzini, 2011/02/21
Re: [Qemu-devel] [PATCH uq/master 00/21] Win32 iothread support, Anthony Liguori, 2011/02/22