From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH 09/10] remove kvm_run from vcpu_context Date: Fri, 9 Oct 2009 15:03:17 -0300 Message-ID: <1255111398-15251-10-git-send-email-glommer@redhat.com> References: <1255111398-15251-1-git-send-email-glommer@redhat.com> <1255111398-15251-2-git-send-email-glommer@redhat.com> <1255111398-15251-3-git-send-email-glommer@redhat.com> <1255111398-15251-4-git-send-email-glommer@redhat.com> <1255111398-15251-5-git-send-email-glommer@redhat.com> <1255111398-15251-6-git-send-email-glommer@redhat.com> <1255111398-15251-7-git-send-email-glommer@redhat.com> <1255111398-15251-8-git-send-email-glommer@redhat.com> <1255111398-15251-9-git-send-email-glommer@redhat.com> Cc: avi@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:1026 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761248AbZJISED (ORCPT ); Fri, 9 Oct 2009 14:04:03 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n99I3b3M032479 for ; Fri, 9 Oct 2009 14:03:37 -0400 In-Reply-To: <1255111398-15251-9-git-send-email-glommer@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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