From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Peter Xu 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> Subject: [Qemu-devel] [PATCH v5 5/5] arm: implement query-gic-capabilities List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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; } -- 2.4.3