[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v5 5/5] arm: implement query-gic-capabilities
From: |
Peter Xu |
Subject: |
[Qemu-arm] [PATCH v5 5/5] arm: implement query-gic-capabilities |
Date: |
Fri, 18 Mar 2016 11:27:34 +0800 |
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 <address@hidden>
---
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 <sys/ioctl.h>
+
+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
- Re: [Qemu-arm] [Qemu-devel] [PATCH v5 2/5] arm: qmp: add query-gic-capabilities interface, (continued)
Re: [Qemu-arm] [PATCH v5 2/5] arm: qmp: add query-gic-capabilities interface, Eric Blake, 2016/03/22
[Qemu-arm] [PATCH v5 3/5] arm: enhance kvm_arm_create_scratch_host_vcpu, Peter Xu, 2016/03/17
[Qemu-arm] [PATCH v5 4/5] kvm: add kvm_support_device() helper function, Peter Xu, 2016/03/17
[Qemu-arm] [PATCH v5 5/5] arm: implement query-gic-capabilities,
Peter Xu <=
Re: [Qemu-arm] [PATCH v5 0/5] ARM: add query-gic-capabilities SMP command, Andrea Bolognani, 2016/03/21
Re: [Qemu-arm] [Qemu-devel] [PATCH v5 0/5] ARM: add query-gic-capabilities SMP command, Markus Armbruster, 2016/03/22
Re: [Qemu-arm] [PATCH v5 0/5] ARM: add query-gic-capabilities SMP command, Peter Maydell, 2016/03/22