From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH 04/10] remove kvm_context from vpcu structure Date: Fri, 9 Oct 2009 15:03:12 -0300 Message-ID: <1255111398-15251-5-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> Cc: avi@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:58536 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761242AbZJISDy (ORCPT ); Fri, 9 Oct 2009 14:03:54 -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 n99I3Sgp029530 for ; Fri, 9 Oct 2009 14:03:28 -0400 In-Reply-To: <1255111398-15251-4-git-send-email-glommer@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: It is not used anywhere, so just blow it away. 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 b92a68e..5c7376d 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -441,9 +441,7 @@ kvm_vcpu_context_t kvm_create_vcpu(CPUState *env, int id) long mmap_size; int r; kvm_vcpu_context_t vcpu_ctx = qemu_malloc(sizeof(struct kvm_vcpu_context)); - kvm_context_t kvm = kvm_context; - vcpu_ctx->kvm = kvm; vcpu_ctx->id = id; r = kvm_vm_ioctl(kvm_state, KVM_CREATE_VCPU, id); @@ -938,8 +936,8 @@ int kvm_run(kvm_vcpu_context_t vcpu, void *env) int r; int fd = vcpu->fd; struct kvm_run *run = vcpu->run; - kvm_context_t kvm = vcpu->kvm; CPUState *_env = env; + kvm_context_t kvm = &_env->kvm_state->kvm_context; again: push_nmi(kvm); diff --git a/qemu-kvm.h b/qemu-kvm.h index e51dd2c..4dfd5ea 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -79,7 +79,6 @@ struct kvm_context { struct kvm_vcpu_context { int fd; struct kvm_run *run; - struct kvm_context *kvm; uint32_t id; }; -- 1.6.2.5