There are no more users of kvm_run inside vcpu context. Remove it, and leave the one inside CPUState for the job. Signed-off-by: Glauber Costa <glommer@xxxxxxxxxx> --- qemu-kvm.c | 4 +--- qemu-kvm.h | 1 - 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index fb50bb4..8257dd3 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -467,8 +467,6 @@ kvm_vcpu_context_t kvm_create_vcpu(CPUState *env, int id) goto err_fd; } - vcpu_ctx->run = env->kvm_run; - return vcpu_ctx; err_fd: close(vcpu_ctx->fd); @@ -938,9 +936,9 @@ int kvm_run(kvm_vcpu_context_t vcpu, void *env) { int r; int fd = vcpu->fd; - struct kvm_run *run = vcpu->run; CPUState *_env = env; kvm_context_t kvm = &_env->kvm_state->kvm_context; + struct kvm_run *run = _env->kvm_run; again: push_nmi(kvm); diff --git a/qemu-kvm.h b/qemu-kvm.h index adb2970..f051889 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -78,7 +78,6 @@ struct kvm_context { struct kvm_vcpu_context { int fd; - struct kvm_run *run; uint32_t id; }; -- 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html