[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/24] kvm: Change kvm_cpu_exec() argument to CPUStat
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 17/24] kvm: Change kvm_cpu_exec() argument to CPUState |
Date: |
Fri, 28 Jun 2013 17:55:39 +0200 |
It no longer uses CPUArchState.
Prepares for changing qemu_kvm_cpu_thread_fn() opaque to CPUState.
Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
cpus.c | 2 +-
include/sysemu/kvm.h | 2 +-
kvm-all.c | 3 +--
kvm-stub.c | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/cpus.c b/cpus.c
index 4c7e329..12f6f32 100644
--- a/cpus.c
+++ b/cpus.c
@@ -752,7 +752,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
while (1) {
if (cpu_can_run(cpu)) {
- r = kvm_cpu_exec(env);
+ r = kvm_cpu_exec(cpu);
if (r == EXCP_DEBUG) {
cpu_handle_guest_debug(env);
}
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 5adb044..fe8bc40 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -147,9 +147,9 @@ int kvm_has_gsi_routing(void);
int kvm_has_intx_set_mask(void);
int kvm_init_vcpu(CPUState *cpu);
+int kvm_cpu_exec(CPUState *cpu);
#ifdef NEED_CPU_H
-int kvm_cpu_exec(CPUArchState *env);
#if !defined(CONFIG_USER_ONLY)
void *kvm_ram_alloc(ram_addr_t size);
diff --git a/kvm-all.c b/kvm-all.c
index d3e5e5e..7a1684e 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1607,9 +1607,8 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu)
cpu->kvm_vcpu_dirty = false;
}
-int kvm_cpu_exec(CPUArchState *env)
+int kvm_cpu_exec(CPUState *cpu)
{
- CPUState *cpu = ENV_GET_CPU(env);
struct kvm_run *run = cpu->kvm_run;
int ret, run_ret;
diff --git a/kvm-stub.c b/kvm-stub.c
index 50af700..5457fe8 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -54,9 +54,9 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu)
{
}
-int kvm_cpu_exec(CPUArchState *env)
+int kvm_cpu_exec(CPUState *cpu)
{
- abort ();
+ abort();
}
int kvm_has_sync_mmu(void)
--
1.8.1.4
- [Qemu-devel] [PULL 12/24] cpus: Change qemu_kvm_wait_io_event() argument to CPUState, (continued)
- [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
- [Qemu-devel] [PULL 18/24] gdbstub: Set gdb_set_stop_cpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 17/24] kvm: Change kvm_cpu_exec() argument to CPUState,
Andreas Färber <=
- [Qemu-devel] [PULL 19/24] cpus: Change cpu_handle_guest_debug() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 21/24] cpus: Change qemu_dummy_start_vcpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 20/24] cpus: Change qemu_kvm_start_vcpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 23/24] hwaddr: Make hwaddr type usable beyond softmmu, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 22/24] cpu: Change qemu_init_vcpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 15/24] cpu: Turn cpu_dump_{state, statistics}() into CPUState hooks, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 24/24] cpu: Turn cpu_unassigned_access() into a CPUState hook, Andreas Färber, 2013/06/28