diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-26 23:38:10 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-06-28 13:25:12 +0200 |
| commit | 491d6e80ea5854d75ab7c19e32a0ba01d08f6df5 (patch) | |
| tree | ac28e47d480522057e5cb5d3433315b2b1dc099b | |
| parent | fd529e8f465c0d6b2d5f01c58cee4746425d2734 (diff) | |
| download | focaccia-qemu-491d6e80ea5854d75ab7c19e32a0ba01d08f6df5.tar.gz focaccia-qemu-491d6e80ea5854d75ab7c19e32a0ba01d08f6df5.zip | |
kvm: Change kvm_set_signal_mask() argument to CPUState
CPUArchState is no longer needed. Prepares for changing qemu_kvm_init_cpu_signals() argument to CPUState. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | cpus.c | 3 | ||||
| -rw-r--r-- | include/sysemu/kvm.h | 2 | ||||
| -rw-r--r-- | kvm-all.c | 3 | ||||
| -rw-r--r-- | kvm-stub.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cpus.c b/cpus.c index 37369aeb8e..7d6b166fcf 100644 --- a/cpus.c +++ b/cpus.c @@ -570,6 +570,7 @@ static void dummy_signal(int sig) static void qemu_kvm_init_cpu_signals(CPUArchState *env) { + CPUState *cpu = ENV_GET_CPU(env); int r; sigset_t set; struct sigaction sigact; @@ -581,7 +582,7 @@ static void qemu_kvm_init_cpu_signals(CPUArchState *env) pthread_sigmask(SIG_BLOCK, NULL, &set); sigdelset(&set, SIG_IPI); sigdelset(&set, SIGBUS); - r = kvm_set_signal_mask(env, &set); + r = kvm_set_signal_mask(cpu, &set); if (r) { fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r)); exit(1); diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 06da2b305c..5adb044443 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -166,7 +166,7 @@ int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, void kvm_remove_all_breakpoints(CPUArchState *current_env); int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap); #ifndef _WIN32 -int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset); +int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset); #endif int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); diff --git a/kvm-all.c b/kvm-all.c index eee294bdf9..f1031e0972 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -2039,9 +2039,8 @@ void kvm_remove_all_breakpoints(CPUArchState *current_env) } #endif /* !KVM_CAP_SET_GUEST_DEBUG */ -int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset) +int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) { - CPUState *cpu = ENV_GET_CPU(env); struct kvm_signal_mask *sigmask; int r; diff --git a/kvm-stub.c b/kvm-stub.c index 128faf7d91..50af7009df 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -100,7 +100,7 @@ void kvm_remove_all_breakpoints(CPUArchState *current_env) } #ifndef _WIN32 -int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset) +int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) { abort(); } |