[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/24] Prevent abortion on multiple VCPU kicks
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 02/24] Prevent abortion on multiple VCPU kicks |
Date: |
Tue, 1 Feb 2011 22:15:42 +0100 |
From: Jan Kiszka <address@hidden>
If we call qemu_cpu_kick more than once before the target was able to
process the signal, pthread_kill will fail, and qemu will abort. Prevent
this by avoiding the redundant signal.
This logic can be found in qemu-kvm as well.
Signed-off-by: Jan Kiszka <address@hidden>
---
cpu-defs.h | 1 +
cpus.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/cpu-defs.h b/cpu-defs.h
index 8d4bf86..db809ed 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -205,6 +205,7 @@ typedef struct CPUWatchpoint {
uint32_t stopped; /* Artificially stopped */ \
struct QemuThread *thread; \
struct QemuCond *halt_cond; \
+ int thread_kicked; \
struct qemu_work_item *queued_work_first, *queued_work_last; \
const char *cpu_model_str; \
struct KVMState *kvm_state; \
diff --git a/cpus.c b/cpus.c
index 4c9928e..ab6e40e 100644
--- a/cpus.c
+++ b/cpus.c
@@ -481,6 +481,7 @@ static void qemu_wait_io_event_common(CPUState *env)
qemu_cond_signal(&qemu_pause_cond);
}
flush_queued_work(env);
+ env->thread_kicked = false;
}
static void qemu_tcg_wait_io_event(void)
@@ -648,7 +649,10 @@ void qemu_cpu_kick(void *_env)
{
CPUState *env = _env;
qemu_cond_broadcast(env->halt_cond);
- qemu_thread_signal(env->thread, SIG_IPI);
+ if (!env->thread_kicked) {
+ qemu_thread_signal(env->thread, SIG_IPI);
+ env->thread_kicked = true;
+ }
}
int qemu_cpu_self(void *_env)
--
1.7.1
- [Qemu-devel] Re: [PATCH v2 13/24] kvm: Set up signal mask also for !CONFIG_IOTHREAD, (continued)
[Qemu-devel] [PATCH v2 14/24] kvm: Refactor qemu_kvm_eat_signals, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 16/24] Set up signalfd under !CONFIG_IOTHREAD, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 20/24] kvm: Unconditionally reenter kernel after IO exits, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 08/24] kvm: Report proper error on GET_VCPU_MMAP_SIZE failures, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 19/24] Introduce VCPU self-signaling service, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 05/24] Trigger exit from cpu_exec_all on pending IO events, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 02/24] Prevent abortion on multiple VCPU kicks,
Jan Kiszka <=
[Qemu-devel] [PATCH v2 06/24] Leave inner main_loop faster on pending requests, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 10/24] kvm: Handle kvm_init_vcpu errors, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 09/24] kvm: Drop redundant kvm_enabled from kvm_cpu_thread_fn, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 24/24] Fix a few coding style violations in cpus.c, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 15/24] kvm: Call qemu_kvm_eat_signals also under !CONFIG_IOTHREAD, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 03/24] Stop current VCPU on synchronous reset requests, Jan Kiszka, 2011/02/01
[Qemu-devel] [PATCH v2 12/24] Refactor signal setup functions in cpus.c, Jan Kiszka, 2011/02/01
[Qemu-devel] Re: [PATCH v2 00/24] [uq/master] Patch queue, part II, Marcelo Tosatti, 2011/02/04