[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/21] kvm: Drop return value of kvm_cpu_exec
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v3 02/21] kvm: Drop return value of kvm_cpu_exec |
Date: |
Tue, 4 Jan 2011 09:32:14 +0100 |
From: Jan Kiszka <address@hidden>
It is not used, it is not needed, so let's remove it.
Signed-off-by: Jan Kiszka <address@hidden>
---
kvm-all.c | 6 ++----
kvm-stub.c | 4 ++--
kvm.h | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index 2538283..7518f2c 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -850,7 +850,7 @@ void kvm_cpu_synchronize_post_init(CPUState *env)
env->kvm_vcpu_dirty = 0;
}
-int kvm_cpu_exec(CPUState *env)
+void kvm_cpu_exec(CPUState *env)
{
struct kvm_run *run = env->kvm_run;
int ret;
@@ -943,7 +943,7 @@ int kvm_cpu_exec(CPUState *env)
#ifdef KVM_CAP_SET_GUEST_DEBUG
if (kvm_arch_debug(&run->debug.arch)) {
env->exception_index = EXCP_DEBUG;
- return 0;
+ return;
}
/* re-enter, this exception was guest-internal */
ret = 1;
@@ -960,8 +960,6 @@ int kvm_cpu_exec(CPUState *env)
env->exit_request = 0;
env->exception_index = EXCP_INTERRUPT;
}
-
- return ret;
}
int kvm_ioctl(KVMState *s, int type, ...)
diff --git a/kvm-stub.c b/kvm-stub.c
index 5384a4b..352c6a6 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -79,9 +79,9 @@ void kvm_cpu_synchronize_post_init(CPUState *env)
{
}
-int kvm_cpu_exec(CPUState *env)
+void kvm_cpu_exec(CPUState *env)
{
- abort ();
+ abort();
}
int kvm_has_sync_mmu(void)
diff --git a/kvm.h b/kvm.h
index 60a9b42..51ad56f 100644
--- a/kvm.h
+++ b/kvm.h
@@ -46,7 +46,7 @@ int kvm_has_xcrs(void);
#ifdef NEED_CPU_H
int kvm_init_vcpu(CPUState *env);
-int kvm_cpu_exec(CPUState *env);
+void kvm_cpu_exec(CPUState *env);
#if !defined(CONFIG_USER_ONLY)
int kvm_log_start(target_phys_addr_t phys_addr, ram_addr_t size);
--
1.7.1
- [Qemu-devel] [PATCH v3 00/21] [uq/master] Prepare for more qemu-kvm merging, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 02/21] kvm: Drop return value of kvm_cpu_exec,
Jan Kiszka <=
- [Qemu-devel] [PATCH v3 06/21] kvm: x86: Align kvm_arch_put_registers code with comment, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 03/21] kvm: Stop on all fatal exit reasons, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 07/21] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 05/21] x86: Optionally dump code bytes on cpu_dump_state, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 01/21] kvm: Fix coding style violations, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 08/21] kvm: x86: Remove redundant mp_state initialization, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 04/21] kvm: Improve reporting of fatal errors, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 09/21] kvm: x86: Fix xcr0 reset mismerge, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 10/21] kvm: x86: Refactor msr_star/hsave_pa setup and checks, Jan Kiszka, 2011/01/04
- [Qemu-devel] [PATCH v3 11/21] kvm: x86: Reset paravirtual MSRs, Jan Kiszka, 2011/01/04