Commit 84c6499e authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qapi: make query-gic-capabilities depend on TARGET_ARM 



Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190214152251.2073-13-armbru@redhat.com>
parent 46e58d1b

monitor.c

+0 −11
Original line number Diff line number Diff line
@@ -1145,9 +1145,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data, 
 */

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)

    qmp_unregister_command(&qmp_commands, "query-cpu-model-expansion");

#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)

{

    MachineState *ms = MACHINE(qdev_get_machine());

qapi/misc.json

+0 −43
Original line number Diff line number Diff line
@@ -3044,49 +3044,6 @@ 
##

{ '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:

#

qapi/target.json

+45 −0
Original line number Diff line number Diff line
@@ -328,3 +328,48 @@ 
            'modelb': 'CpuModelInfo' },

  'returns': 'CpuModelBaselineInfo',

  '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)' }

target/arm/monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "qemu/osdep.h"

#include "hw/boards.h"

#include "kvm_arm.h"

#include "qapi/qapi-commands-misc.h"

#include "qapi/qapi-commands-target.h"



static GICCapability *gic_cap_new(int version)

{