From patchwork Fri Jun 3 14:39:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 847092 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 p53Ee20a018371 for ; Fri, 3 Jun 2011 14:40:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752694Ab1FCOj7 (ORCPT ); Fri, 3 Jun 2011 10:39:59 -0400 Received: from thoth.sbs.de ([192.35.17.2]:15568 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102Ab1FCOj7 (ORCPT ); Fri, 3 Jun 2011 10:39:59 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p53EduhH009127; Fri, 3 Jun 2011 16:39:56 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p53EdtgS018080; Fri, 3 Jun 2011 16:39:55 +0200 Message-ID: <4DE8F23B.1030508@siemens.com> Date: Fri, 03 Jun 2011 16:39:55 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] qemu-kvm: Remove kvm_set_boot_cpu_id 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, 03 Jun 2011 14:40:02 +0000 (UTC) Upstream just as well as qemu-kvm only support CPU 0 as boot CPU. And that is also the KVM ABI default if the user does not issue any KVM_SET_BOOT_CPU_ID. So let's drop this redundancy. It can be re-introduced via upstream once we support something more sophisticated. Signed-off-by: Jan Kiszka --- qemu-kvm.c | 11 ----------- qemu-kvm.h | 2 -- target-i386/kvm.c | 5 ----- 3 files changed, 0 insertions(+), 18 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 649af9c..80cc077 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -655,14 +655,3 @@ int kvm_update_ioport_access(CPUState *env) #endif /* CONFIG_KVM_DEVICE_ASSIGNMENT */ return 0; } - -int kvm_set_boot_cpu_id(KVMState *s, uint32_t 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 942baf2..09d07d0 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -291,8 +291,6 @@ extern unsigned int kvm_shadow_memory; int kvm_handle_tpr_access(CPUState *env); -int kvm_set_boot_cpu_id(KVMState *s, uint32_t id); - #else #define kvm_nested 0 #endif diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 74a9960..de26646 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -662,11 +662,6 @@ int kvm_arch_init(KVMState *s) } } - ret = kvm_set_boot_cpu_id(s, 0); - if (ret < 0 && ret != -ENOSYS) { - return ret; - } - return 0; }