From patchwork Fri May 13 12:14:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 782812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4DCElVg032487 for ; Fri, 13 May 2011 12:14:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932699Ab1EMMOj (ORCPT ); Fri, 13 May 2011 08:14:39 -0400 Received: from thoth.sbs.de ([192.35.17.2]:15226 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758594Ab1EMMOP (ORCPT ); Fri, 13 May 2011 08:14:15 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p4DCECsG031687; Fri, 13 May 2011 14:14:12 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4DCEAvH019933; Fri, 13 May 2011 14:14:11 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 12/16] qemu-kvm: Fold kvm_set_boot_vcpu_id into kvm_set_boot_cpu_id Date: Fri, 13 May 2011 14:14:06 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 13 May 2011 12:14:47 +0000 (UTC) Signed-off-by: Jan Kiszka --- qemu-kvm.c | 23 ++++++++--------------- qemu-kvm.h | 2 +- target-i386/kvm.c | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 9406fcf..b1405fd 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -197,19 +197,6 @@ static void kvm_finalize(KVMState *s) free(s); } -static int kvm_set_boot_vcpu_id(kvm_context_t kvm, uint32_t id) -{ -#ifdef KVM_CAP_SET_BOOT_CPU_ID - int r = kvm_ioctl(kvm_state, KVM_CHECK_EXTENSION, KVM_CAP_SET_BOOT_CPU_ID); - if (r > 0) { - return kvm_vm_ioctl(kvm_state, KVM_SET_BOOT_CPU_ID, id); - } - return -ENOSYS; -#else - return -ENOSYS; -#endif -} - static int kvm_init_irq_routing(KVMState *s) { #ifdef KVM_CAP_IRQ_ROUTING @@ -1497,8 +1484,14 @@ void kvm_ioperm(CPUState *env, void *data) #endif -int kvm_set_boot_cpu_id(uint32_t id) +int kvm_set_boot_cpu_id(KVMState *s, uint32_t id) { - return kvm_set_boot_vcpu_id(&kvm_state->kvm_context, id); +#ifdef KVM_CAP_SET_BOOT_CPU_ID + int r = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_SET_BOOT_CPU_ID); + if (r > 0) { + return kvm_vm_ioctl(s, KVM_SET_BOOT_CPU_ID, id); + } +#endif + return -ENOSYS; } diff --git a/qemu-kvm.h b/qemu-kvm.h index 2c67a28..a55ef46 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -358,7 +358,7 @@ int kvm_arch_has_work(CPUState *env); void kvm_arch_process_irqchip_events(CPUState *env); int kvm_arch_try_push_interrupts(void *opaque); void kvm_arch_push_nmi(void); -int kvm_set_boot_cpu_id(uint32_t id); +int kvm_set_boot_cpu_id(KVMState *s, uint32_t id); void kvm_tpr_access_report(CPUState *env, uint64_t rip, int is_write); diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 33239bf..9b8c460 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -665,7 +665,7 @@ int kvm_arch_init(KVMState *s) } } - ret = kvm_set_boot_cpu_id(0); + ret = kvm_set_boot_cpu_id(s, 0); if (ret < 0 && ret != -ENOSYS) { return ret; }