From patchwork Wed Oct 3 13:29:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 188775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A9C402C00C6 for ; Wed, 3 Oct 2012 23:54:59 +1000 (EST) Received: from localhost ([::1]:40089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJP0w-0006Qn-5l for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 09:29:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJOzy-0004Az-7T for qemu-devel@nongnu.org; Wed, 03 Oct 2012 09:28:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJOzs-0006ad-UW for qemu-devel@nongnu.org; Wed, 03 Oct 2012 09:28:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJOzs-0006aC-Lz for qemu-devel@nongnu.org; Wed, 03 Oct 2012 09:28:20 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q93DSKNo027907 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Oct 2012 09:28:20 -0400 Received: from blackpad.lan.raisama.net (vpn1-7-147.gru2.redhat.com [10.97.7.147]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q93DSJ88019821; Wed, 3 Oct 2012 09:28:19 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 08A07203627; Wed, 3 Oct 2012 10:29:20 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2012 10:29:03 -0300 Message-Id: <1349270954-4657-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1349270954-4657-1-git-send-email-ehabkost@redhat.com> References: <1349270954-4657-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , Paolo Bonzini Subject: [Qemu-devel] [RFC 07/18] kvm: create kvm_arch_vcpu_id() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This will allow each architecture to define how the VCPU ID is set on the KVM_CREATE_VCPU ioctl call. Signed-off-by: Eduardo Habkost --- kvm-all.c | 2 +- kvm.h | 3 +++ target-i386/kvm.c | 5 +++++ target-ppc/kvm.c | 5 +++++ target-s390x/kvm.c | 5 +++++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/kvm-all.c b/kvm-all.c index 92a7137..2fb2596 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -222,7 +222,7 @@ int kvm_init_vcpu(CPUArchState *env) DPRINTF("kvm_init_vcpu\n"); - ret = kvm_vm_ioctl(s, KVM_CREATE_VCPU, env->cpu_index); + ret = kvm_vm_ioctl(s, KVM_CREATE_VCPU, kvm_arch_vcpu_id(env)); if (ret < 0) { DPRINTF("kvm_create_vcpu failed\n"); goto err; diff --git a/kvm.h b/kvm.h index dea2998..e88058f 100644 --- a/kvm.h +++ b/kvm.h @@ -181,6 +181,9 @@ int kvm_arch_init(KVMState *s); int kvm_arch_init_vcpu(CPUArchState *env); +/* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */ +unsigned long kvm_arch_vcpu_id(CPUArchState *env); + void kvm_arch_reset_vcpu(CPUArchState *env); int kvm_arch_on_sigbus_vcpu(CPUArchState *env, int code, void *addr); diff --git a/target-i386/kvm.c b/target-i386/kvm.c index ce8678d..bb972d8 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -353,6 +353,11 @@ static void cpu_update_state(void *opaque, int running, RunState state) } } +unsigned long kvm_arch_vcpu_id(CPUArchState *env) +{ + return env->cpu_index; +} + int kvm_arch_init_vcpu(CPUX86State *env) { struct { diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index a31d278..e74a189 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -371,6 +371,11 @@ static inline void kvm_fixup_page_sizes(CPUPPCState *env) #endif /* !defined (TARGET_PPC64) */ +unsigned long kvm_arch_vcpu_id(CPUArchState *env) +{ + return env->cpu_index; +} + int kvm_arch_init_vcpu(CPUPPCState *cenv) { int ret; diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 07edf93..9e4c6c6 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -72,6 +72,11 @@ int kvm_arch_init(KVMState *s) return 0; } +unsigned long kvm_arch_vcpu_id(CPUArchState *env) +{ + return env->cpu_index; +} + int kvm_arch_init_vcpu(CPUS390XState *env) { int ret = 0;