mirror of https://github.com/proxmox/mirror_qemu
qapi: make query-gic-capabilities depend on TARGET_ARM
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190214152251.2073-13-armbru@redhat.com>master
parent
46e58d1b85
commit
84c6499eb1
11
monitor.c
11
monitor.c
|
@ -1145,9 +1145,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
|
||||||
*/
|
*/
|
||||||
static void qmp_unregister_commands_hack(void)
|
static void qmp_unregister_commands_hack(void)
|
||||||
{
|
{
|
||||||
#ifndef TARGET_ARM
|
|
||||||
qmp_unregister_command(&qmp_commands, "query-gic-capabilities");
|
|
||||||
#endif
|
|
||||||
#if !defined(TARGET_S390X) && !defined(TARGET_I386)
|
#if !defined(TARGET_S390X) && !defined(TARGET_I386)
|
||||||
qmp_unregister_command(&qmp_commands, "query-cpu-model-expansion");
|
qmp_unregister_command(&qmp_commands, "query-cpu-model-expansion");
|
||||||
#endif
|
#endif
|
||||||
|
@ -4657,14 +4654,6 @@ QemuOptsList qemu_mon_opts = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef TARGET_ARM
|
|
||||||
GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
|
|
||||||
{
|
|
||||||
error_setg(errp, QERR_FEATURE_DISABLED, "query-gic-capabilities");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)
|
HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)
|
||||||
{
|
{
|
||||||
MachineState *ms = MACHINE(qdev_get_machine());
|
MachineState *ms = MACHINE(qdev_get_machine());
|
||||||
|
|
|
@ -3044,49 +3044,6 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} }
|
{ 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} }
|
||||||
|
|
||||||
##
|
|
||||||
# @GICCapability:
|
|
||||||
#
|
|
||||||
# The struct describes capability for a specific GIC (Generic
|
|
||||||
# Interrupt Controller) version. These bits are not only decided by
|
|
||||||
# QEMU/KVM software version, but also decided by the hardware that
|
|
||||||
# the program is running upon.
|
|
||||||
#
|
|
||||||
# @version: version of GIC to be described. Currently, only 2 and 3
|
|
||||||
# are supported.
|
|
||||||
#
|
|
||||||
# @emulated: whether current QEMU/hardware supports emulated GIC
|
|
||||||
# device in user space.
|
|
||||||
#
|
|
||||||
# @kernel: whether current QEMU/hardware supports hardware
|
|
||||||
# accelerated GIC device in kernel.
|
|
||||||
#
|
|
||||||
# Since: 2.6
|
|
||||||
##
|
|
||||||
{ 'struct': 'GICCapability',
|
|
||||||
'data': { 'version': 'int',
|
|
||||||
'emulated': 'bool',
|
|
||||||
'kernel': 'bool' } }
|
|
||||||
|
|
||||||
##
|
|
||||||
# @query-gic-capabilities:
|
|
||||||
#
|
|
||||||
# This command is ARM-only. It will return a list of GICCapability
|
|
||||||
# objects that describe its capability bits.
|
|
||||||
#
|
|
||||||
# Returns: a list of GICCapability objects.
|
|
||||||
#
|
|
||||||
# Since: 2.6
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# -> { "execute": "query-gic-capabilities" }
|
|
||||||
# <- { "return": [{ "version": 2, "emulated": true, "kernel": false },
|
|
||||||
# { "version": 3, "emulated": false, "kernel": true } ] }
|
|
||||||
#
|
|
||||||
##
|
|
||||||
{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'] }
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# @CpuInstanceProperties:
|
# @CpuInstanceProperties:
|
||||||
#
|
#
|
||||||
|
|
|
@ -328,3 +328,48 @@
|
||||||
'modelb': 'CpuModelInfo' },
|
'modelb': 'CpuModelInfo' },
|
||||||
'returns': 'CpuModelBaselineInfo',
|
'returns': 'CpuModelBaselineInfo',
|
||||||
'if': 'defined(TARGET_S390X)' }
|
'if': 'defined(TARGET_S390X)' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @GICCapability:
|
||||||
|
#
|
||||||
|
# The struct describes capability for a specific GIC (Generic
|
||||||
|
# Interrupt Controller) version. These bits are not only decided by
|
||||||
|
# QEMU/KVM software version, but also decided by the hardware that
|
||||||
|
# the program is running upon.
|
||||||
|
#
|
||||||
|
# @version: version of GIC to be described. Currently, only 2 and 3
|
||||||
|
# are supported.
|
||||||
|
#
|
||||||
|
# @emulated: whether current QEMU/hardware supports emulated GIC
|
||||||
|
# device in user space.
|
||||||
|
#
|
||||||
|
# @kernel: whether current QEMU/hardware supports hardware
|
||||||
|
# accelerated GIC device in kernel.
|
||||||
|
#
|
||||||
|
# Since: 2.6
|
||||||
|
##
|
||||||
|
{ 'struct': 'GICCapability',
|
||||||
|
'data': { 'version': 'int',
|
||||||
|
'emulated': 'bool',
|
||||||
|
'kernel': 'bool' },
|
||||||
|
'if': 'defined(TARGET_ARM)' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @query-gic-capabilities:
|
||||||
|
#
|
||||||
|
# This command is ARM-only. It will return a list of GICCapability
|
||||||
|
# objects that describe its capability bits.
|
||||||
|
#
|
||||||
|
# Returns: a list of GICCapability objects.
|
||||||
|
#
|
||||||
|
# Since: 2.6
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
#
|
||||||
|
# -> { "execute": "query-gic-capabilities" }
|
||||||
|
# <- { "return": [{ "version": 2, "emulated": true, "kernel": false },
|
||||||
|
# { "version": 3, "emulated": false, "kernel": true } ] }
|
||||||
|
#
|
||||||
|
##
|
||||||
|
{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'],
|
||||||
|
'if': 'defined(TARGET_ARM)' }
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
#include "kvm_arm.h"
|
#include "kvm_arm.h"
|
||||||
#include "qapi/qapi-commands-misc.h"
|
#include "qapi/qapi-commands-target.h"
|
||||||
|
|
||||||
static GICCapability *gic_cap_new(int version)
|
static GICCapability *gic_cap_new(int version)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue