From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQywS-0003LN-76 for qemu-devel@nongnu.org; Fri, 21 Mar 2014 08:53:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQywG-0004T1-Hp for qemu-devel@nongnu.org; Fri, 21 Mar 2014 08:52:56 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:35714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQywG-0004So-88 for qemu-devel@nongnu.org; Fri, 21 Mar 2014 08:52:44 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Mar 2014 12:52:43 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 42196219005E for ; Fri, 21 Mar 2014 12:52:36 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s2LCqTw82818498 for ; Fri, 21 Mar 2014 12:52:29 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s2LCqeOo016306 for ; Fri, 21 Mar 2014 06:52:41 -0600 From: Cornelia Huck Date: Fri, 21 Mar 2014 13:52:34 +0100 Message-Id: <1395406357-14766-3-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1395406357-14766-1-git-send-email-cornelia.huck@de.ibm.com> References: <1395406357-14766-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH v3 2/5] kvm: add kvm_enable_cap_{vm,vcpu} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, qemu-devel@nongnu.org Cc: gleb@kernel.org, borntraeger@de.ibm.com, Cornelia Huck , agraf@suse.de, pbonzini@redhat.com Provide helper functions for enabling capabilities (on a vcpu and on a vm). Reviewed-by: Thomas Huth Signed-off-by: Cornelia Huck --- include/sysemu/kvm.h | 4 ++++ kvm-all.c | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 0bee1e8..d89911c 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -294,6 +294,10 @@ bool kvm_arch_stop_on_emulation_error(CPUState *cpu); int kvm_check_extension(KVMState *s, unsigned int extension); +int kvm_enable_cap_vm(KVMState *s, unsigned int capability); + +int kvm_enable_cap_vcpu(CPUState *cpu, unsigned int capability); + uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, uint32_t index, int reg); diff --git a/kvm-all.c b/kvm-all.c index 82a9119..658690f 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -501,7 +501,24 @@ int kvm_check_extension(KVMState *s, unsigned int extension) return ret; } -static int kvm_set_ioeventfd_mmio(int fd, hwaddr addr, uint32_t val, +int kvm_enable_cap_vm(KVMState *s, unsigned int capability) +{ + struct kvm_enable_cap cap = {}; + + cap.cap = capability; + return kvm_vm_ioctl(s, KVM_ENABLE_CAP, &cap); +} + +int kvm_enable_cap_vcpu(CPUState *cpu, unsigned int capability) +{ + struct kvm_enable_cap cap = {}; + + cap.cap = capability; + return kvm_vcpu_ioctl(cpu, KVM_ENABLE_CAP, &cap); +} + + +static int kvm_set_ioeventfd_mmio(int fd, uint32_t addr, uint32_t val, bool assign, uint32_t size, bool datamatch) { int ret; -- 1.7.9.5