Re: [Qemu-devel] [PATCH v4 2/3] arm: qmp: add query-gic-capabilities interface
On Wed, Mar 16, 2016 at 10:24:39AM +, Peter Maydell wrote:
> On 8 March 2016 at 07:36, Peter Xu wrote:
> > diff --git a/target-arm/machine.c b/target-arm/machine.c
> > index 03a73d9..813909e 100644
> > --- a/target-arm/machine.c
> > +++ b/target-arm/machine.c
> > @@ -5,6 +5,7 @@
> > #include "sysemu/kvm.h"
> > #include "kvm_arm.h"
> > #include "internals.h"
> > +#include "qmp-commands.h"
> >
> > static bool vfp_needed(void *opaque)
> > {
> > @@ -345,3 +346,8 @@ const char *gicv3_class_name(void)
> >
> > exit(1);
> > }
> > +
> > +GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
> > +{
> > +return NULL;
> > +}
>
> Why is this here? machine.c is for migration code.
Hi, Peter,
Thanks for the review comments. Do you have any suggestion on which
file should I add this in (or create a new one)? I failed to figure
it out myself. :(
TIA.
-- peterx
Re: [Qemu-devel] [PATCH v4 2/3] arm: qmp: add query-gic-capabilities interface
On 17 March 2016 at 04:09, Peter Xu wrote: > Thanks for the review comments. Do you have any suggestion on which > file should I add this in (or create a new one)? I failed to figure > it out myself. :( I suggest target-arm/monitor.c (we have a monitor.c for other target-* already for monitor related functions). thanks -- PMM
Re: [Qemu-devel] [PATCH v4 2/3] arm: qmp: add query-gic-capabilities interface
On Thu, Mar 17, 2016 at 08:50:38AM +, Peter Maydell wrote: > On 17 March 2016 at 04:09, Peter Xu wrote: > > Thanks for the review comments. Do you have any suggestion on which > > file should I add this in (or create a new one)? I failed to figure > > it out myself. :( > > I suggest target-arm/monitor.c (we have a monitor.c for other > target-* already for monitor related functions). Will take your advice and respin. Thanks! -- peterx
Re: [Qemu-devel] [PATCH v4 2/3] arm: qmp: add query-gic-capabilities interface
On 8 March 2016 at 07:36, Peter Xu wrote:
> This patch adds the command "query-gic-capabilities" but not implemnet
> it. The command is ARM-only. Return of the command is a list of
> GICCapability struct that describes all GIC versions that current QEMU
> and system support.
>
> Signed-off-by: Peter Xu
> ---
> monitor.c| 8
> qapi-schema.json | 11 +++
> qmp-commands.hx | 26 ++
> scripts/qapi.py | 1 +
> target-arm/machine.c | 6 ++
> 5 files changed, 52 insertions(+)
>
> diff --git a/monitor.c b/monitor.c
> index 73eac17..9e8cbdb 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
> +GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
> +{
> +error_setg(errp, QERR_FEATURE_DISABLED, "query-gic-capabilities");
> +return NULL;
> +}
> +#endif
Given where we are in the release cycle I guess we need to do this,
but longer term we should sort out a structure so we can add
target-specific qmp and hmp commands without having to add more
TARGET_* ifdefs to common files...
> diff --git a/target-arm/machine.c b/target-arm/machine.c
> index 03a73d9..813909e 100644
> --- a/target-arm/machine.c
> +++ b/target-arm/machine.c
> @@ -5,6 +5,7 @@
> #include "sysemu/kvm.h"
> #include "kvm_arm.h"
> #include "internals.h"
> +#include "qmp-commands.h"
>
> static bool vfp_needed(void *opaque)
> {
> @@ -345,3 +346,8 @@ const char *gicv3_class_name(void)
>
> exit(1);
> }
> +
> +GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
> +{
> +return NULL;
> +}
Why is this here? machine.c is for migration code.
thanks
-- PMM
[Qemu-devel] [PATCH v4 2/3] arm: qmp: add query-gic-capabilities interface
This patch adds the command "query-gic-capabilities" but not implemnet
it. The command is ARM-only. Return of the command is a list of
GICCapability struct that describes all GIC versions that current QEMU
and system support.
Signed-off-by: Peter Xu
---
monitor.c| 8
qapi-schema.json | 11 +++
qmp-commands.hx | 26 ++
scripts/qapi.py | 1 +
target-arm/machine.c | 6 ++
5 files changed, 52 insertions(+)
diff --git a/monitor.c b/monitor.c
index 73eac17..9e8cbdb 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
+GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
+{
+error_setg(errp, QERR_FEATURE_DISABLED, "query-gic-capabilities");
+return NULL;
+}
+#endif
diff --git a/qapi-schema.json b/qapi-schema.json
index 0b2de6c..9c0a503 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4157,3 +4157,14 @@
'data': { 'version': 'int',
'emulated': 'bool',
'kernel': 'bool' } }
+
+##
+# @query-gic-capabilities:
+#
+# Return a list of supported GIC version capabilities.
+#
+# Returns: a list of GICCapability.
+#
+# Since: 2.6
+##
+{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'] }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 13f158d..c003838 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -4852,3 +4852,29 @@ Example:
{"type": 0, "out-pport": 0, "pport": 0, "vlan-id": 3840,
"pop-vlan": 1, "id": 251658240}
]}
+
+EQMP
+
+#if defined TARGET_ARM
+{
+.name = "query-gic-capabilities",
+.args_type = "",
+.mhandler.cmd_new = qmp_marshal_query_gic_capabilities,
+},
+#endif
+
+SQMP
+query-gic-capabilities
+---
+
+Return a list of supported ARM GIC versions and their capabilities.
+
+Arguments: None
+
+Example:
+
+-> { "execute": "query-gic-capabilities" }
+<- { "return": [{ "version": 2, "emulated": true, "kernel": false },
+{ "version": 3, "emulated": false, "kernel": true } ] }
+
+EQMP
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 849..9dc8f73 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 03a73d9..813909e 100644
--- a/target-arm/machine.c
+++ b/target-arm/machine.c
@@ -5,6 +5,7 @@
#include "sysemu/kvm.h"
#include "kvm_arm.h"
#include "internals.h"
+#include "qmp-commands.h"
static bool vfp_needed(void *opaque)
{
@@ -345,3 +346,8 @@ const char *gicv3_class_name(void)
exit(1);
}
+
+GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
+{
+return NULL;
+}
--
2.4.3
