[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/24] kvm: Change kvm_set_signal_mask() argument to
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 13/24] kvm: Change kvm_set_signal_mask() argument to CPUState |
Date: |
Fri, 28 Jun 2013 17:55:35 +0200 |
CPUArchState is no longer needed.
Prepares for changing qemu_kvm_init_cpu_signals() argument to CPUState.
Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
cpus.c | 3 ++-
include/sysemu/kvm.h | 2 +-
kvm-all.c | 3 +--
kvm-stub.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cpus.c b/cpus.c
index 37369ae..7d6b166 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 06da2b3..5adb044 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 eee294b..f1031e0 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 128faf7..50af700 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();
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/24] QOM CPUState patch queue 2013-06-28, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 06/24] cpu: Guard cpu_{save, load}() definitions, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 07/24] gdbstub: Simplify find_cpu(), Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 05/24] target-openrisc: Register VMStateDescription for OpenRISCCPU, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 08/24] kvm: Change kvm_cpu_synchronize_state() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 13/24] kvm: Change kvm_set_signal_mask() argument to CPUState,
Andreas Färber <=
- [Qemu-devel] [PULL 11/24] cpus: Change cpu_thread_is_idle() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 12/24] cpus: Change qemu_kvm_wait_io_event() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 01/24] cpu: Fix cpu_class_set_vmsd() documentation, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 09/24] kvm: Change cpu_synchronize_state() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 02/24] cpu: Introduce device_class_set_vmsd() helper, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 03/24] cpu: Introduce VMSTATE_CPU() macro for CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 10/24] cpu: Change cpu_exit() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 04/24] target-alpha: Register VMStateDescription for AlphaCPU, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 14/24] cpus: Change qemu_kvm_init_cpu_signals() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 16/24] kvm: Change kvm_handle_internal_error() argument to CPUState, Andreas Färber, 2013/06/28