From patchwork Fri Oct 9 18:03:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 52776 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n99I6uNu012234 for ; Fri, 9 Oct 2009 18:06:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932596AbZJISD5 (ORCPT ); Fri, 9 Oct 2009 14:03:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761247AbZJISD5 (ORCPT ); Fri, 9 Oct 2009 14:03:57 -0400 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 Received: from localhost.localdomain (vpn-12-36.rdu.redhat.com [10.11.12.36]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n99I3JJC017374; Fri, 9 Oct 2009 14:03:27 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com 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> In-Reply-To: <1255111398-15251-4-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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; };