mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make qemu_thread_create block all signals

Browse Source 
All signals will thus be routed through the IO thread.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2010-06-03 15:20:32 +02:00 committed by Anthony Liguori
parent 304e3a7c80
commit 55541c8afc
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cpus.c
View File

@ -318,8 +318,8 @@ static QemuCond qemu_system_cond;
static QemuCond qemu_pause_cond; static QemuCond qemu_pause_cond;
static QemuCond qemu_work_cond; static QemuCond qemu_work_cond;
static void tcg_block_io_signals(void); static void tcg_init_ipi(void);
static void kvm_block_io_signals(CPUState *env); static void kvm_init_ipi(CPUState *env);
static void unblock_io_signals(void); static void unblock_io_signals(void);
int qemu_init_main_loop(void) int qemu_init_main_loop(void)
@ -464,7 +464,7 @@ static void *kvm_cpu_thread_fn(void *arg)
if (kvm_enabled()) if (kvm_enabled())
kvm_init_vcpu(env); kvm_init_vcpu(env);
kvm_block_io_signals(env); kvm_init_ipi(env);
/* signal CPU creation */ /* signal CPU creation */
env->created = 1; env->created = 1;
@ -487,7 +487,7 @@ static void *tcg_cpu_thread_fn(void *arg)
{ {
CPUState *env = arg; CPUState *env = arg;
tcg_block_io_signals(); tcg_init_ipi();
qemu_thread_self(env->thread); qemu_thread_self(env->thread);
/* signal CPU creation */ /* signal CPU creation */
@ -532,52 +532,36 @@ static void cpu_signal(int sig)
exit_request = 1; exit_request = 1;
} }
static void tcg_block_io_signals(void) static void tcg_init_ipi(void)
{ {
sigset_t set; sigset_t set;
struct sigaction sigact; struct sigaction sigact;
sigemptyset(&set); memset(&sigact, 0, sizeof(sigact));
sigaddset(&set, SIGUSR2); sigact.sa_handler = cpu_signal;
sigaddset(&set, SIGIO); sigaction(SIG_IPI, &sigact, NULL);
sigaddset(&set, SIGALRM);
sigaddset(&set, SIGCHLD);
pthread_sigmask(SIG_BLOCK, &set, NULL);
sigemptyset(&set); sigemptyset(&set);
sigaddset(&set, SIG_IPI); sigaddset(&set, SIG_IPI);
pthread_sigmask(SIG_UNBLOCK, &set, NULL); pthread_sigmask(SIG_UNBLOCK, &set, NULL);
memset(&sigact, 0, sizeof(sigact));
sigact.sa_handler = cpu_signal;
sigaction(SIG_IPI, &sigact, NULL);
} }
static void dummy_signal(int sig) static void dummy_signal(int sig)
{ {
} }
static void kvm_block_io_signals(CPUState *env) static void kvm_init_ipi(CPUState *env)
{ {
int r; int r;
sigset_t set; sigset_t set;
struct sigaction sigact; struct sigaction sigact;
sigemptyset(&set);
sigaddset(&set, SIGUSR2);
sigaddset(&set, SIGIO);
sigaddset(&set, SIGALRM);
sigaddset(&set, SIGCHLD);
sigaddset(&set, SIG_IPI);
pthread_sigmask(SIG_BLOCK, &set, NULL);
pthread_sigmask(SIG_BLOCK, NULL, &set);
sigdelset(&set, SIG_IPI);
memset(&sigact, 0, sizeof(sigact)); memset(&sigact, 0, sizeof(sigact));
sigact.sa_handler = dummy_signal; sigact.sa_handler = dummy_signal;
sigaction(SIG_IPI, &sigact, NULL); sigaction(SIG_IPI, &sigact, NULL);
pthread_sigmask(SIG_BLOCK, NULL, &set);
sigdelset(&set, SIG_IPI);
r = kvm_set_signal_mask(env, &set); r = kvm_set_signal_mask(env, &set);
if (r) { if (r) {
fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(r)); fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(r));

7
qemu-thread.c
View File

@ -137,9 +137,16 @@ void qemu_thread_create(QemuThread *thread,
{ {
int err; int err;
/* Leave signal handling to the iothread. */
sigset_t set, oldset;
sigfillset(&set);
pthread_sigmask(SIG_SETMASK, &set, &oldset);
err = pthread_create(&thread->thread, NULL, start_routine, arg); err = pthread_create(&thread->thread, NULL, start_routine, arg);
if (err) if (err)
error_exit(err, __func__); error_exit(err, __func__);
pthread_sigmask(SIG_SETMASK, &oldset, NULL);
} }
void qemu_thread_signal(QemuThread *thread, int sig) void qemu_thread_signal(QemuThread *thread, int sig)