From patchwork Mon Mar 17 18:11:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 331099 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1CB912C0096 for ; Tue, 18 Mar 2014 05:16:11 +1100 (EST) Received: from localhost ([::1]:59508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPc52-0001kx-QW for incoming@patchwork.ozlabs.org; Mon, 17 Mar 2014 14:16:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPc1N-0005Qn-9m for qemu-devel@nongnu.org; Mon, 17 Mar 2014 14:12:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPc1D-0001ID-Qi for qemu-devel@nongnu.org; Mon, 17 Mar 2014 14:12:21 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:36160) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPc1D-0001Hv-Hd for qemu-devel@nongnu.org; Mon, 17 Mar 2014 14:12:11 -0400 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 17 Mar 2014 18:12:10 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 17 Mar 2014 18:12:09 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 0833F2190046 for ; Mon, 17 Mar 2014 18:12:04 +0000 (GMT) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s2HIBuqb63963202 for ; Mon, 17 Mar 2014 18:11:56 GMT Received: from d06av02.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s2HIC7BG006001 for ; Mon, 17 Mar 2014 12:12:08 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-49.boeblingen.de.ibm.com [9.152.224.49]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s2HIC4Pj005895; Mon, 17 Mar 2014 12:12:07 -0600 From: Cornelia Huck To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, qemu-devel@nongnu.org Date: Mon, 17 Mar 2014 19:11:58 +0100 Message-Id: <1395079921-29325-3-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395079921-29325-1-git-send-email-cornelia.huck@de.ibm.com> References: <1395079921-29325-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14031718-8372-0000-0000-0000090255D7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.108 Cc: gleb@kernel.org, borntraeger@de.ibm.com, Cornelia Huck , agraf@suse.de, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v2 2/5] kvm: add kvm_enable_cap_{vm,vcpu} 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 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;