summaryrefslogtreecommitdiff
path: root/qemu-kvm.h
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2010-02-19 19:22:20 +0100
committerAvi Kivity <avi@redhat.com>2010-02-21 11:19:52 +0200
commit9aa832f1f449ddfe5a2a407373e7ea965fdb86f6 (patch)
treecb30df10318ea8792cee7aced5a45f87babb6762 /qemu-kvm.h
parent19e893df8765a6cc8c3a4b70fdeb70591ba628d2 (diff)
Clean up register access API
qemu-kvm's functions for accessing the VCPU registers are kvm_arch_load/save_regs. Use them directly instead of going through various wrappers. Specifically, we do not need on_vcpu wrapping as all users either already run in the related thread or call while the vm is stopped. This is now also validated during runtime via asserts. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm.h')
-rw-r--r--qemu-kvm.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/qemu-kvm.h b/qemu-kvm.h
index c1675d427..9c132da8e 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -902,8 +902,6 @@ int kvm_main_loop(void);
int kvm_init_ap(void);
#ifndef QEMU_KVM_NO_CPU
int kvm_vcpu_inited(CPUState *env);
-void kvm_load_registers(CPUState *env);
-void kvm_save_registers(CPUState *env);
void kvm_load_mpstate(CPUState *env);
void kvm_save_mpstate(CPUState *env);
int kvm_cpu_exec(CPUState *env);
@@ -1069,8 +1067,6 @@ void kvm_load_tsc(CPUState *env);
#ifdef TARGET_I386
#define qemu_kvm_has_pit_state2() (0)
#endif
-#define kvm_load_registers(env) do {} while(0)
-#define kvm_save_registers(env) do {} while(0)
#define kvm_save_mpstate(env) do {} while(0)
#define qemu_kvm_cpu_stop(env) do {} while(0)
static inline void kvm_init_vcpu(CPUState *env)
@@ -1099,13 +1095,6 @@ static inline int kvm_sync_vcpus(void)
}
#ifndef QEMU_KVM_NO_CPU
-void kvm_arch_get_registers(CPUState *env);
-
-static inline void kvm_arch_put_registers(CPUState *env)
-{
- kvm_load_registers(env);
-}
-
void kvm_cpu_synchronize_state(CPUState *env);
static inline void cpu_synchronize_state(CPUState *env)
@@ -1168,6 +1157,9 @@ int kvm_check_extension(KVMState *s, unsigned int ext);
int kvm_tpr_enable_vapic(CPUState *env);
+unsigned long kvm_get_thread_id(void);
+int kvm_cpu_is_stopped(CPUState *env);
+
#endif
#endif