[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] arm: gic: add "query-gic-capability" interface
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH 2/3] arm: gic: add "query-gic-capability" interface |
Date: |
Tue, 23 Feb 2016 18:52:07 +0800 |
This is ARM-only command.
Signed-off-by: Peter Xu <address@hidden>
---
monitor.c | 8 ++++++++
qapi-schema.json | 11 +++++++++++
qmp-commands.hx | 25 +++++++++++++++++++++++++
scripts/qapi.py | 1 +
target-arm/machine.c | 7 +++++++
5 files changed, 52 insertions(+)
diff --git a/monitor.c b/monitor.c
index 73eac17..1c7f127 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4241,3 +4241,11 @@ void qmp_dump_skeys(const char *filename, Error **errp)
error_setg(errp, QERR_FEATURE_DISABLED, "dump-skeys");
}
#endif
+
+#ifndef TARGET_ARM
+GICTypeList *qmp_query_gic_capability(Error **errp)
+{
+ error_setg(errp, QERR_FEATURE_DISABLED, "query-gic-capability");
+ return NULL;
+}
+#endif
diff --git a/qapi-schema.json b/qapi-schema.json
index 81654bd..7e3b8cd 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4100,3 +4100,14 @@
# Since: 2.6
##
{ 'enum': 'GICType', 'data': [ 'gicv2', 'gicv3', 'gicv2-kvm', 'gicv3-kvm' ] }
+
+##
+# @query-gic-capability:
+#
+# Return a list of supported GIC types
+#
+# Returns: a list of GICType
+#
+# Since: 2.6
+##
+{ 'command': 'query-gic-capability', 'returns': ['GICType'] }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 020e5ee..55930d3 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -4818,3 +4818,28 @@ Example:
{"type": 0, "out-pport": 0, "pport": 0, "vlan-id": 3840,
"pop-vlan": 1, "id": 251658240}
]}
+
+EQMP
+
+#if defined TARGET_ARM
+ {
+ .name = "query-gic-capability",
+ .args_type = "",
+ .mhandler.cmd_new = qmp_marshal_query_gic_capability,
+ },
+#endif
+
+SQMP
+query-gic-capability
+---------------
+
+Return a list of supported ARM GIC types.
+
+Arguments: None
+
+Example:
+
+-> { "execute": "query-gic-capability" }
+<- { "return": [ "gicv2", "gicv2-kvm", "gicv3-kvm" ] }
+
+EQMP
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 7dec611..f4900a1 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -46,6 +46,7 @@ returns_whitelist = [
'query-tpm-models',
'query-tpm-types',
'ringbuf-read',
+ 'query-gic-capability',
# From QGA:
'guest-file-open',
diff --git a/target-arm/machine.c b/target-arm/machine.c
index ed1925a..9e10232 100644
--- a/target-arm/machine.c
+++ b/target-arm/machine.c
@@ -347,3 +347,10 @@ const char *gicv3_class_name(void)
exit(1);
}
+
+GICTypeList *qmp_query_gic_capability(Error **errp);
+
+GICTypeList *qmp_query_gic_capability(Error **errp)
+{
+ return NULL;
+}
--
2.4.3