mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
qapi: expose query-gic-capability command unconditionally
This removes the TARGET_ARM condition from the query-gic-capability command. This requires providing a QMP command stub for non-ARM targets. This in turn requires moving the command out of misc-target.json, since that will trigger symbol poisoning errors when built from target independent code. Following the earlier precedent, this creates a misc-arm.json file to hold this ARM specific command. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Message-ID: <20250522190542.588267-5-pierrick.bouvier@linaro.org> Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
7373759583
commit
30fbb25871
7 changed files with 65 additions and 45 deletions
|
@ -64,6 +64,7 @@ if have_system
|
|||
'qdev',
|
||||
'pci',
|
||||
'rocker',
|
||||
'misc-arm',
|
||||
'misc-i386',
|
||||
'tpm',
|
||||
'uefi',
|
||||
|
|
49
qapi/misc-arm.json
Normal file
49
qapi/misc-arm.json
Normal file
|
@ -0,0 +1,49 @@
|
|||
# -*- Mode: Python -*-
|
||||
# vim: filetype=python
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
##
|
||||
# @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:
|
||||
#
|
||||
# It will return a list of GICCapability objects that describe its
|
||||
# capability bits.
|
||||
#
|
||||
# On non-ARM targets this command will report an error as the GIC
|
||||
# technology is not applicable.
|
||||
#
|
||||
# Returns: a list of GICCapability objects.
|
||||
#
|
||||
# Since: 2.6
|
||||
#
|
||||
# .. qmp-example::
|
||||
#
|
||||
# -> { "execute": "query-gic-capabilities" }
|
||||
# <- { "return": [{ "version": 2, "emulated": true, "kernel": false },
|
||||
# { "version": 3, "emulated": false, "kernel": true } ] }
|
||||
##
|
||||
{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'] }
|
|
@ -2,50 +2,6 @@
|
|||
# vim: filetype=python
|
||||
#
|
||||
|
||||
##
|
||||
# @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': '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
|
||||
#
|
||||
# .. qmp-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': 'TARGET_ARM' }
|
||||
|
||||
##
|
||||
# @SgxEpcSection:
|
||||
#
|
||||
|
|
|
@ -61,6 +61,7 @@
|
|||
{ 'include': 'replay.json' }
|
||||
{ 'include': 'yank.json' }
|
||||
{ 'include': 'misc.json' }
|
||||
{ 'include': 'misc-arm.json' }
|
||||
{ 'include': 'misc-i386.json' }
|
||||
{ 'include': 'misc-target.json' }
|
||||
{ 'include': 'audio.json' }
|
||||
|
|
|
@ -77,6 +77,7 @@ if have_system
|
|||
stub_ss.add(files('target-monitor-defs.c'))
|
||||
stub_ss.add(files('win32-kbd-hook.c'))
|
||||
stub_ss.add(files('xen-hw-stub.c'))
|
||||
stub_ss.add(files('monitor-arm-gic.c'))
|
||||
stub_ss.add(files('monitor-i386-rtc.c'))
|
||||
stub_ss.add(files('monitor-i386-sev.c'))
|
||||
endif
|
||||
|
|
12
stubs/monitor-arm-gic.c
Normal file
12
stubs/monitor-arm-gic.c
Normal file
|
@ -0,0 +1,12 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-misc-arm.h"
|
||||
|
||||
|
||||
GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
|
||||
{
|
||||
error_setg(errp, "GIC hardware is not available on this target");
|
||||
return NULL;
|
||||
}
|
|
@ -27,7 +27,7 @@
|
|||
#include "qapi/visitor.h"
|
||||
#include "qapi/qobject-input-visitor.h"
|
||||
#include "qapi/qapi-commands-machine-target.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "qapi/qapi-commands-misc-arm.h"
|
||||
#include "qobject/qdict.h"
|
||||
#include "qom/qom-qobject.h"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue