From patchwork Fri Mar 18 03:27:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 8616011 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E2D819F6E1 for ; Fri, 18 Mar 2016 03:29:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48E722038E for ; Fri, 18 Mar 2016 03:29:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9267A2038A for ; Fri, 18 Mar 2016 03:29:43 +0000 (UTC) Received: from localhost ([::1]:41291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agl6c-0000wr-Vt for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Mar 2016 23:29:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agl56-0006OE-9e for qemu-devel@nongnu.org; Thu, 17 Mar 2016 23:28:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agl55-0000xW-5e for qemu-devel@nongnu.org; Thu, 17 Mar 2016 23:28:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agl52-0000wc-T7; Thu, 17 Mar 2016 23:28:04 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 89C81C00DDEA; Fri, 18 Mar 2016 03:28:04 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-7-63.pek2.redhat.com [10.72.7.63]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2I3Rce6023061; Thu, 17 Mar 2016 23:28:00 -0400 From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 18 Mar 2016 11:27:34 +0800 Message-Id: <1458271654-23706-6-git-send-email-peterx@redhat.com> In-Reply-To: <1458271654-23706-1-git-send-email-peterx@redhat.com> References: <1458271654-23706-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: wei@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com, peterx@redhat.com, abologna@redhat.com, qemu-arm@nongnu.org Subject: [Qemu-devel] [PATCH v5 5/5] arm: implement query-gic-capabilities 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For emulated GIC capabilities, currently only gicv2 is supported. We need to add gicv3 in when emulated gicv3 ready. For KVM accelerated ARM VM, we detect the capability bits by creating a scratch VM. Signed-off-by: Peter Xu --- target-arm/monitor.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/target-arm/monitor.c b/target-arm/monitor.c index 5678eb8..5493ea6 100644 --- a/target-arm/monitor.c +++ b/target-arm/monitor.c @@ -24,8 +24,63 @@ #include "qemu/error-report.h" #include "sysemu/kvm.h" #include "qmp-commands.h" +#include "kvm_arm.h" +#include + +static GICCapability *gic_cap_new(int version) +{ + GICCapability *cap = g_new0(GICCapability, 1); + cap->version = version; + /* by default, support none */ + cap->emulated = false; + cap->kernel = false; + return cap; +} + +static GICCapabilityList *gic_cap_list_add(GICCapabilityList *head, + GICCapability *cap) +{ + GICCapabilityList *item = g_new0(GICCapabilityList, 1); + item->value = cap; + item->next = head; + return item; +} GICCapabilityList *qmp_query_gic_capabilities(Error **errp) { - return NULL; + GICCapabilityList *head = NULL; + GICCapability *v2 = gic_cap_new(2), *v3 = gic_cap_new(3); + + v2->emulated = true; + /* FIXME: we'd change to true after we get emulated GICv3. */ + v3->emulated = false; + +#ifdef CONFIG_KVM + { + int fdarray[3]; + + if (!kvm_arm_create_scratch_host_vcpu(NULL, fdarray, NULL)) { + goto out; + } + + /* Test KVM GICv2 */ + if (kvm_support_device(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V2)) { + v2->kernel = true; + } + + /* Test KVM GICv3 */ + if (kvm_support_device(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V3)) { + v3->kernel = true; + } + + kvm_arm_destroy_scratch_host_vcpu(fdarray); +out: + ; + } +#endif + + head = gic_cap_list_add(head, v2); + head = gic_cap_list_add(head, v3); + + return head; }