From dd2e19aee64ad93d170fc7f285c7072aa4e360a0 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 26 May 2011 17:25:46 +0300 Subject: [PATCH] kvm tools: Exit VCPU thread only when SIGKVMEXIT is received Currently the VCPU loop would exit when the thread received any signal. Change behaviour to exit only when SIGKVMEXIT is received. This change prevents from the guest to terminate when unrelated signals are processed by the thread (for example, when attaching a debugger). Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- tools/kvm/include/kvm/kvm-cpu.h | 2 ++ tools/kvm/kvm-cpu.c | 15 ++++++++++----- tools/kvm/kvm-run.c | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/kvm/include/kvm/kvm-cpu.h b/tools/kvm/include/kvm/kvm-cpu.h index f241e86a9692..b2b6fceea3ed 100644 --- a/tools/kvm/include/kvm/kvm-cpu.h +++ b/tools/kvm/include/kvm/kvm-cpu.h @@ -21,6 +21,8 @@ struct kvm_cpu { struct kvm_fpu fpu; struct kvm_msrs *msrs; /* dynamically allocated */ + + u8 is_running; }; struct kvm_cpu *kvm_cpu__init(struct kvm *kvm, unsigned long cpu_id); diff --git a/tools/kvm/kvm-cpu.c b/tools/kvm/kvm-cpu.c index 331e02517cc5..de0591f88d1a 100644 --- a/tools/kvm/kvm-cpu.c +++ b/tools/kvm/kvm-cpu.c @@ -14,6 +14,8 @@ #include #include +extern __thread struct kvm_cpu *current_kvm_cpu; + static inline bool is_in_protected_mode(struct kvm_cpu *vcpu) { return vcpu->sregs.cr0 & 0x01; @@ -87,6 +89,8 @@ struct kvm_cpu *kvm_cpu__init(struct kvm *kvm, unsigned long cpu_id) if (vcpu->kvm_run == MAP_FAILED) die("unable to mmap vcpu fd"); + vcpu->is_running = true; + return vcpu; } @@ -381,7 +385,10 @@ void kvm_cpu__run(struct kvm_cpu *vcpu) static void kvm_cpu_exit_handler(int signum) { - /* Don't do anything here */ + if (current_kvm_cpu->is_running) { + current_kvm_cpu->is_running = false; + pthread_kill(pthread_self(), SIGKVMEXIT); + } } int kvm_cpu__start(struct kvm_cpu *cpu) @@ -437,10 +444,8 @@ int kvm_cpu__start(struct kvm_cpu *cpu) break; } case KVM_EXIT_INTR: - /* - * Currently we only handle exit signal, which means - * we just exit if KVM_RUN exited due to a signal. - */ + if (cpu->is_running) + break; goto exit_kvm; case KVM_EXIT_SHUTDOWN: goto exit_kvm; diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c index 76b578294073..f384dddcc548 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -48,7 +48,7 @@ static struct kvm *kvm; static struct kvm_cpu *kvm_cpus[KVM_NR_CPUS]; -static __thread struct kvm_cpu *current_kvm_cpu; +__thread struct kvm_cpu *current_kvm_cpu; static u64 ram_size; static u8 image_count; -- 2.39.5