From patchwork Wed Jul 8 13:09:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 34613 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 n68D9Qtx016586 for ; Wed, 8 Jul 2009 13:09:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754863AbZGHNJX (ORCPT ); Wed, 8 Jul 2009 09:09:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753753AbZGHNJX (ORCPT ); Wed, 8 Jul 2009 09:09:23 -0400 Received: from mx2.redhat.com ([66.187.237.31]:38647 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754406AbZGHNJH (ORCPT ); Wed, 8 Jul 2009 09:09:07 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n68D97dk026592 for ; Wed, 8 Jul 2009 09:09:07 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n68D964B024288; Wed, 8 Jul 2009 09:09:06 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n68D92uJ029245; Wed, 8 Jul 2009 09:09:06 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com Subject: [PATCH 6/8] provide env->kvm_fd Date: Wed, 8 Jul 2009 09:09:00 -0400 Message-Id: <1247058542-31211-7-git-send-email-glommer@redhat.com> In-Reply-To: <1247058542-31211-6-git-send-email-glommer@redhat.com> References: <1247058542-31211-1-git-send-email-glommer@redhat.com> <1247058542-31211-2-git-send-email-glommer@redhat.com> <1247058542-31211-3-git-send-email-glommer@redhat.com> <1247058542-31211-4-git-send-email-glommer@redhat.com> <1247058542-31211-5-git-send-email-glommer@redhat.com> <1247058542-31211-6-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org qemu upstream puts kvm information on env. Do that too, since it will allow us to use CPUState in cpu-specific functions, instead of kvm-specific types. Signed-off-by: Glauber Costa --- kvm-all.c | 12 ++++++++---- libkvm-all.h | 12 ------------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 15bd429..b404f76 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1519,21 +1519,25 @@ void kvm_disable_pit_creation(kvm_context_t kvm) kvm->no_pit_creation = 1; } -kvm_vcpu_context_t kvm_create_vcpu(kvm_context_t kvm, int id) +static kvm_vcpu_context_t kvm_create_vcpu(kvm_context_t kvm, CPUState *env) { long mmap_size; int r; kvm_vcpu_context_t vcpu_ctx = qemu_malloc(sizeof(struct kvm_vcpu_context)); vcpu_ctx->kvm = kvm; - vcpu_ctx->id = id; + vcpu_ctx->id = env->cpu_index; - r = ioctl(kvm->vm_fd, KVM_CREATE_VCPU, id); + r = ioctl(kvm->vm_fd, KVM_CREATE_VCPU, env->cpu_index); if (r == -1) { fprintf(stderr, "kvm_create_vcpu: %m\n"); goto err; } vcpu_ctx->fd = r; + + env->kvm_fd = r; + env->kvm_state = kvm_state; + mmap_size = ioctl(kvm->fd, KVM_GET_VCPU_MMAP_SIZE, 0); if (mmap_size == -1) { fprintf(stderr, "get vcpu mmap size: %m\n"); @@ -3029,7 +3033,7 @@ static void *ap_main_loop(void *_env) env->thread_id = kvm_get_thread_id(); sigfillset(&signals); sigprocmask(SIG_BLOCK, &signals, NULL); - env->kvm_cpu_state.vcpu_ctx = kvm_create_vcpu(kvm_context, env->cpu_index); + env->kvm_cpu_state.vcpu_ctx = kvm_create_vcpu(kvm_context, env); #ifdef USE_KVM_DEVICE_ASSIGNMENT /* do ioperm for io ports of assigned devices */ diff --git a/libkvm-all.h b/libkvm-all.h index 7857532..9c018eb 100644 --- a/libkvm-all.h +++ b/libkvm-all.h @@ -234,18 +234,6 @@ int kvm_check_extension(kvm_context_t kvm, int ext); void kvm_create_irqchip(kvm_context_t kvm); /*! - * \brief Create a new virtual cpu - * - * This creates a new virtual cpu (the first vcpu is created by kvm_create()). - * Should be called from a thread dedicated to the vcpu. - * - * \param kvm kvm context - * \param slot vcpu number (> 0) - * \return 0 on success, -errno on failure - */ -kvm_vcpu_context_t kvm_create_vcpu(kvm_context_t kvm, int id); - -/*! * \brief Start the VCPU * * This starts the VCPU and virtualization is started.\n