[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/17] arm: implement query-gic-capabilities
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 17/17] arm: implement query-gic-capabilities |
Date: |
Wed, 30 Mar 2016 15:57:49 +0100 |
From: Peter Xu <address@hidden>
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>
Acked-by: Sergey Fedorov <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/monitor.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 57 insertions(+), 1 deletion(-)
diff --git a/target-arm/monitor.c b/target-arm/monitor.c
index 4c9bef3..1ee59a2 100644
--- a/target-arm/monitor.c
+++ b/target-arm/monitor.c
@@ -21,8 +21,64 @@
*/
#include "qemu/osdep.h"
#include "qmp-commands.h"
+#include "hw/boards.h"
+#include "kvm_arm.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;
+}
+
+static inline void gic_cap_kvm_probe(GICCapability *v2, GICCapability *v3)
+{
+#ifdef CONFIG_KVM
+ int fdarray[3];
+
+ if (!kvm_arm_create_scratch_host_vcpu(NULL, fdarray, NULL)) {
+ return;
+ }
+
+ /* Test KVM GICv2 */
+ if (kvm_device_supported(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V2)) {
+ v2->kernel = true;
+ }
+
+ /* Test KVM GICv3 */
+ if (kvm_device_supported(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V3)) {
+ v3->kernel = true;
+ }
+
+ kvm_arm_destroy_scratch_host_vcpu(fdarray);
+#endif
+}
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;
+ /* TODO: we'd change to true after we get emulated GICv3. */
+ v3->emulated = false;
+
+ gic_cap_kvm_probe(v2, v3);
+
+ head = gic_cap_list_add(head, v2);
+ head = gic_cap_list_add(head, v3);
+
+ return head;
}
--
1.9.1
- [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 17/17] arm: implement query-gic-capabilities,
Peter Maydell <=
- [Qemu-devel] [PULL 12/17] block: m25p80: n25q256a/n25q512a models, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 11/17] block: m25p80: Implemented FSR register, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 14/17] arm: qmp: add query-gic-capabilities interface, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 13/17] block: m25p80: at25128a/at25256a models, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 04/17] block: m25p80: RESET_ENABLE and RESET_MEMORY commands, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 09/17] block: m25p80: Dummy cycles for N25Q256/512, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 06/17] block: m25p80: Extend address mode, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 08/17] block: m25p80: Add configuration registers, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 07/17] block: m25p80: 4byte address mode, Peter Maydell, 2016/03/30
- [Qemu-devel] [PULL 05/17] block: m25p80: Widen flags variable, Peter Maydell, 2016/03/30