summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-07-06 16:12:51 -0400
committerAvi Kivity <avi@redhat.com>2009-07-07 12:49:23 +0300
commit1b1c8cb72a33abbcc4b967cac7ceb47e99dabfb0 (patch)
tree855ff655f7f7cbb000a3706364571a2b2e71ebd8 /qemu-kvm-x86.c
parentRemove kvm_qemu_destroy (diff)
downloadqemu-kvm-1b1c8cb72a33abbcc4b967cac7ceb47e99dabfb0.tar.gz
qemu-kvm-1b1c8cb72a33abbcc4b967cac7ceb47e99dabfb0.tar.bz2
qemu-kvm-1b1c8cb72a33abbcc4b967cac7ceb47e99dabfb0.zip
Remove qemu-kvm callbacks structure
The purpose of that was only to allow the user of libkvm to register functions pointers that corresponded to possible actions. We don't need that anymore. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm-x86.c')
-rw-r--r--qemu-kvm-x86.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index e528acbdf..0620c1444 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -121,9 +121,10 @@ int kvm_arch_create(kvm_context_t kvm, unsigned long phys_mem_bytes,
static int kvm_handle_tpr_access(kvm_vcpu_context_t vcpu)
{
struct kvm_run *run = vcpu->run;
- return vcpu->kvm->callbacks->tpr_access(vcpu->kvm->opaque, vcpu,
- run->tpr_access.rip,
- run->tpr_access.is_write);
+ kvm_tpr_access_report(cpu_single_env,
+ run->tpr_access.rip,
+ run->tpr_access.is_write);
+ return 0;
}
@@ -326,7 +327,7 @@ void kvm_show_code(kvm_vcpu_context_t vcpu)
for (n = -back_offset; n < SHOW_CODE_LEN-back_offset; ++n) {
if (n == 0)
strcat(code_str, " -->");
- r = kvm->callbacks->mmio_read(kvm->opaque, rip + n, &code, 1);
+ r = kvm_mmio_read(kvm->opaque, rip + n, &code, 1);
if (r < 0) {
strcat(code_str, " xx");
continue;
@@ -1344,13 +1345,6 @@ void kvm_arch_update_regs_for_sipi(CPUState *env)
kvm_arch_load_regs(env);
}
-int handle_tpr_access(void *opaque, kvm_vcpu_context_t vcpu,
- uint64_t rip, int is_write)
-{
- kvm_tpr_access_report(cpu_single_env, rip, is_write);
- return 0;
-}
-
void kvm_arch_cpu_reset(CPUState *env)
{
kvm_arch_load_regs(env);