[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 37/37] kvm: Pass CPUState to kvm_on_sigbus_vcpu()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 37/37] kvm: Pass CPUState to kvm_on_sigbus_vcpu() |
Date: |
Mon, 28 Jan 2013 17:18:54 +0100 |
Since commit 20d695a9254c1b086a456d3b79a3c311236643ba (kvm: Pass
CPUState to kvm_arch_*) CPUArchState is no longer needed.
Allows to change qemu_kvm_eat_signals() argument as well.
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Gleb Natapov <address@hidden>
---
cpus.c | 8 ++++----
include/sysemu/kvm.h | 2 +-
kvm-all.c | 3 +--
kvm-stub.c | 2 +-
4 Dateien geändert, 7 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)
diff --git a/cpus.c b/cpus.c
index a4390c3..41779eb 100644
--- a/cpus.c
+++ b/cpus.c
@@ -517,7 +517,7 @@ static void qemu_init_sigbus(void)
prctl(PR_MCE_KILL, PR_MCE_KILL_SET, PR_MCE_KILL_EARLY, 0, 0);
}
-static void qemu_kvm_eat_signals(CPUArchState *env)
+static void qemu_kvm_eat_signals(CPUState *cpu)
{
struct timespec ts = { 0, 0 };
siginfo_t siginfo;
@@ -538,7 +538,7 @@ static void qemu_kvm_eat_signals(CPUArchState *env)
switch (r) {
case SIGBUS:
- if (kvm_on_sigbus_vcpu(env, siginfo.si_code, siginfo.si_addr)) {
+ if (kvm_on_sigbus_vcpu(cpu, siginfo.si_code, siginfo.si_addr)) {
sigbus_reraise();
}
break;
@@ -560,7 +560,7 @@ static void qemu_init_sigbus(void)
{
}
-static void qemu_kvm_eat_signals(CPUArchState *env)
+static void qemu_kvm_eat_signals(CPUState *cpu)
{
}
#endif /* !CONFIG_LINUX */
@@ -727,7 +727,7 @@ static void qemu_kvm_wait_io_event(CPUArchState *env)
qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex);
}
- qemu_kvm_eat_signals(env);
+ qemu_kvm_eat_signals(cpu);
qemu_wait_io_event_common(cpu);
}
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 384ee66..6e6dfb3 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -159,7 +159,7 @@ int kvm_update_guest_debug(CPUArchState *env, unsigned long
reinject_trap);
int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset);
#endif
-int kvm_on_sigbus_vcpu(CPUArchState *env, int code, void *addr);
+int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr);
int kvm_on_sigbus(int code, void *addr);
/* internal API */
diff --git a/kvm-all.c b/kvm-all.c
index 363a358..04ec2d5 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -2026,9 +2026,8 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr,
uint16_t val, bool assign)
return 0;
}
-int kvm_on_sigbus_vcpu(CPUArchState *env, int code, void *addr)
+int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr)
{
- CPUState *cpu = ENV_GET_CPU(env);
return kvm_arch_on_sigbus_vcpu(cpu, code, addr);
}
diff --git a/kvm-stub.c b/kvm-stub.c
index 47f8dca..760aadc 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -112,7 +112,7 @@ int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t
val, bool assign, uint
return -ENOSYS;
}
-int kvm_on_sigbus_vcpu(CPUArchState *env, int code, void *addr)
+int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr)
{
return 1;
}
--
1.7.10.4
- [Qemu-devel] [PATCH 24/37] target-m68k: Detect attempt to instantiate non-CPU type in cpu_init(), (continued)
- [Qemu-devel] [PATCH 24/37] target-m68k: Detect attempt to instantiate non-CPU type in cpu_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 27/37] qom: Introduce object_class_is_abstract(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 30/37] target-m68k: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 26/37] target-unicore32: Detect attempt to instantiate non-CPU type in cpu_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 32/37] target-unicore32: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 33/37] target-openrisc: Use type_register() instead of type_register_static(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 35/37] target-m68k: Use type_register() instead of type_register_static(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 29/37] target-arm: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 36/37] cpu: Unconditionalize CPUState fields, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 31/37] target-openrisc: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 37/37] kvm: Pass CPUState to kvm_on_sigbus_vcpu(),
Andreas Färber <=
- [Qemu-devel] [PATCH 34/37] target-unicore32: Use type_register() instead of type_register_static(), Andreas Färber, 2013/01/28