From 3d0223025efb8e971085445af55d5e804d3c1733 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Tue, 2 Jun 2009 16:47:40 +0300 Subject: Do not use cpu_index in interface between libkvm and qemu On vcpu creation cookie is returned which is used in future communication. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity --- qemu-kvm-ia64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qemu-kvm-ia64.c') diff --git a/qemu-kvm-ia64.c b/qemu-kvm-ia64.c index 0e65cb4b0..d33c1c3ed 100644 --- a/qemu-kvm-ia64.c +++ b/qemu-kvm-ia64.c @@ -31,7 +31,7 @@ int kvm_arch_qemu_init_env(CPUState *cenv) return 0; } -int kvm_arch_halt(void *opaque, int vcpu) +int kvm_arch_halt(void *opaque, kvm_vcpu_context_t vcpu) { CPUState *env = cpu_single_env; env->hflags |= HF_HALTED_MASK; @@ -104,7 +104,7 @@ void kvm_save_mpstate(CPUState *env) int r; struct kvm_mp_state mp_state; - r = kvm_get_mpstate(kvm_context, env->cpu_index, &mp_state); + r = kvm_get_mpstate(env->kvm_cpu_state.vcpu_ctx, &mp_state); if (r < 0) env->mp_state = -1; else @@ -122,7 +122,7 @@ void kvm_load_mpstate(CPUState *env) * so don't touch it. */ if (env->mp_state != -1) - kvm_set_mpstate(kvm_context, env->cpu_index, &mp_state); + kvm_set_mpstate(env->kvm_cpu_state.vcpu_ctx, &mp_state); #endif } @@ -130,7 +130,7 @@ void kvm_arch_cpu_reset(CPUState *env) { if (kvm_irqchip_in_kernel(kvm_context)) { #ifdef KVM_CAP_MP_STATE - kvm_reset_mpstate(kvm_context, env->cpu_index); + kvm_reset_mpstate(env->kvm_cpu_state.vcpu_ctx); #endif } else { env->interrupt_request &= ~CPU_INTERRUPT_HARD; -- cgit v1.2.3-65-gdbad