mirror of
https://github.com/xqemu/xqemu.git
synced 2024-06-06 07:19:19 -04:00
qapi: make query-cpu-definitions depend on specific targets
It depends on TARGET_PPC || TARGET_ARM || TARGET_I386 || TARGET_S390X. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190214152251.2073-15-armbru@redhat.com>
This commit is contained in:
parent
96f75b59b6
commit
25a9d6ca63
|
@ -32,5 +32,4 @@ extern const uint32_t arch_type;
|
||||||
int kvm_available(void);
|
int kvm_available(void);
|
||||||
int xen_available(void);
|
int xen_available(void);
|
||||||
|
|
||||||
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
22
monitor.c
22
monitor.c
|
@ -1131,26 +1131,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
|
||||||
*ret_data = qobject_from_qlit(&qmp_schema_qlit);
|
*ret_data = qobject_from_qlit(&qmp_schema_qlit);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* We used to define commands in qmp-commands.hx in addition to the
|
|
||||||
* QAPI schema. This permitted defining some of them only in certain
|
|
||||||
* configurations. query-commands has always reflected that (good,
|
|
||||||
* because it lets QMP clients figure out what's actually available),
|
|
||||||
* while query-qmp-schema never did (not so good). This function is a
|
|
||||||
* hack to keep the configuration-specific commands defined exactly as
|
|
||||||
* before, even though qmp-commands.hx is gone.
|
|
||||||
*
|
|
||||||
* FIXME Educate the QAPI schema on configuration-specific commands,
|
|
||||||
* and drop this hack.
|
|
||||||
*/
|
|
||||||
static void qmp_unregister_commands_hack(void)
|
|
||||||
{
|
|
||||||
#if !defined(TARGET_PPC) && !defined(TARGET_ARM) && !defined(TARGET_I386) \
|
|
||||||
&& !defined(TARGET_S390X)
|
|
||||||
qmp_unregister_command(&qmp_commands, "query-cpu-definitions");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void monitor_init_qmp_commands(void)
|
static void monitor_init_qmp_commands(void)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -1169,8 +1149,6 @@ static void monitor_init_qmp_commands(void)
|
||||||
qmp_register_command(&qmp_commands, "netdev_add", qmp_netdev_add,
|
qmp_register_command(&qmp_commands, "netdev_add", qmp_netdev_add,
|
||||||
QCO_NO_OPTIONS);
|
QCO_NO_OPTIONS);
|
||||||
|
|
||||||
qmp_unregister_commands_hack();
|
|
||||||
|
|
||||||
QTAILQ_INIT(&qmp_cap_negotiation_commands);
|
QTAILQ_INIT(&qmp_cap_negotiation_commands);
|
||||||
qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",
|
qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",
|
||||||
qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG);
|
qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG);
|
||||||
|
|
|
@ -2057,54 +2057,6 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' }
|
{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' }
|
||||||
|
|
||||||
##
|
|
||||||
# @CpuDefinitionInfo:
|
|
||||||
#
|
|
||||||
# Virtual CPU definition.
|
|
||||||
#
|
|
||||||
# @name: the name of the CPU definition
|
|
||||||
#
|
|
||||||
# @migration-safe: whether a CPU definition can be safely used for
|
|
||||||
# migration in combination with a QEMU compatibility machine
|
|
||||||
# when migrating between different QEMU versions and between
|
|
||||||
# hosts with different sets of (hardware or software)
|
|
||||||
# capabilities. If not provided, information is not available
|
|
||||||
# and callers should not assume the CPU definition to be
|
|
||||||
# migration-safe. (since 2.8)
|
|
||||||
#
|
|
||||||
# @static: whether a CPU definition is static and will not change depending on
|
|
||||||
# QEMU version, machine type, machine options and accelerator options.
|
|
||||||
# A static model is always migration-safe. (since 2.8)
|
|
||||||
#
|
|
||||||
# @unavailable-features: List of properties that prevent
|
|
||||||
# the CPU model from running in the current
|
|
||||||
# host. (since 2.8)
|
|
||||||
# @typename: Type name that can be used as argument to @device-list-properties,
|
|
||||||
# to introspect properties configurable using -cpu or -global.
|
|
||||||
# (since 2.9)
|
|
||||||
#
|
|
||||||
# @unavailable-features is a list of QOM property names that
|
|
||||||
# represent CPU model attributes that prevent the CPU from running.
|
|
||||||
# If the QOM property is read-only, that means there's no known
|
|
||||||
# way to make the CPU model run in the current host. Implementations
|
|
||||||
# that choose not to provide specific information return the
|
|
||||||
# property name "type".
|
|
||||||
# If the property is read-write, it means that it MAY be possible
|
|
||||||
# to run the CPU model in the current host if that property is
|
|
||||||
# changed. Management software can use it as hints to suggest or
|
|
||||||
# choose an alternative for the user, or just to generate meaningful
|
|
||||||
# error messages explaining why the CPU model can't be used.
|
|
||||||
# If @unavailable-features is an empty list, the CPU model is
|
|
||||||
# runnable using the current host and machine-type.
|
|
||||||
# If @unavailable-features is not present, runnability
|
|
||||||
# information for the CPU is not available.
|
|
||||||
#
|
|
||||||
# Since: 1.2.0
|
|
||||||
##
|
|
||||||
{ 'struct': 'CpuDefinitionInfo',
|
|
||||||
'data': { 'name': 'str', '*migration-safe': 'bool', 'static': 'bool',
|
|
||||||
'*unavailable-features': [ 'str' ], 'typename': 'str' } }
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# @MemoryInfo:
|
# @MemoryInfo:
|
||||||
#
|
#
|
||||||
|
@ -2137,16 +2089,6 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' }
|
{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' }
|
||||||
|
|
||||||
##
|
|
||||||
# @query-cpu-definitions:
|
|
||||||
#
|
|
||||||
# Return a list of supported virtual CPU definitions
|
|
||||||
#
|
|
||||||
# Returns: a list of CpuDefInfo
|
|
||||||
#
|
|
||||||
# Since: 1.2.0
|
|
||||||
##
|
|
||||||
{ 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'] }
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# @CpuModelInfo:
|
# @CpuModelInfo:
|
||||||
|
|
|
@ -425,3 +425,67 @@
|
||||||
'model': 'CpuModelInfo' },
|
'model': 'CpuModelInfo' },
|
||||||
'returns': 'CpuModelExpansionInfo',
|
'returns': 'CpuModelExpansionInfo',
|
||||||
'if': 'defined(TARGET_S390X) || defined(TARGET_I386)' }
|
'if': 'defined(TARGET_S390X) || defined(TARGET_I386)' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @CpuDefinitionInfo:
|
||||||
|
#
|
||||||
|
# Virtual CPU definition.
|
||||||
|
#
|
||||||
|
# @name: the name of the CPU definition
|
||||||
|
#
|
||||||
|
# @migration-safe: whether a CPU definition can be safely used for
|
||||||
|
# migration in combination with a QEMU compatibility machine
|
||||||
|
# when migrating between different QEMU versions and between
|
||||||
|
# hosts with different sets of (hardware or software)
|
||||||
|
# capabilities. If not provided, information is not available
|
||||||
|
# and callers should not assume the CPU definition to be
|
||||||
|
# migration-safe. (since 2.8)
|
||||||
|
#
|
||||||
|
# @static: whether a CPU definition is static and will not change depending on
|
||||||
|
# QEMU version, machine type, machine options and accelerator options.
|
||||||
|
# A static model is always migration-safe. (since 2.8)
|
||||||
|
#
|
||||||
|
# @unavailable-features: List of properties that prevent
|
||||||
|
# the CPU model from running in the current
|
||||||
|
# host. (since 2.8)
|
||||||
|
# @typename: Type name that can be used as argument to @device-list-properties,
|
||||||
|
# to introspect properties configurable using -cpu or -global.
|
||||||
|
# (since 2.9)
|
||||||
|
#
|
||||||
|
# @unavailable-features is a list of QOM property names that
|
||||||
|
# represent CPU model attributes that prevent the CPU from running.
|
||||||
|
# If the QOM property is read-only, that means there's no known
|
||||||
|
# way to make the CPU model run in the current host. Implementations
|
||||||
|
# that choose not to provide specific information return the
|
||||||
|
# property name "type".
|
||||||
|
# If the property is read-write, it means that it MAY be possible
|
||||||
|
# to run the CPU model in the current host if that property is
|
||||||
|
# changed. Management software can use it as hints to suggest or
|
||||||
|
# choose an alternative for the user, or just to generate meaningful
|
||||||
|
# error messages explaining why the CPU model can't be used.
|
||||||
|
# If @unavailable-features is an empty list, the CPU model is
|
||||||
|
# runnable using the current host and machine-type.
|
||||||
|
# If @unavailable-features is not present, runnability
|
||||||
|
# information for the CPU is not available.
|
||||||
|
#
|
||||||
|
# Since: 1.2.0
|
||||||
|
##
|
||||||
|
{ 'struct': 'CpuDefinitionInfo',
|
||||||
|
'data': { 'name': 'str',
|
||||||
|
'*migration-safe': 'bool',
|
||||||
|
'static': 'bool',
|
||||||
|
'*unavailable-features': [ 'str' ],
|
||||||
|
'typename': 'str' },
|
||||||
|
'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X)' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @query-cpu-definitions:
|
||||||
|
#
|
||||||
|
# Return a list of supported virtual CPU definitions
|
||||||
|
#
|
||||||
|
# Returns: a list of CpuDefInfo
|
||||||
|
#
|
||||||
|
# Since: 1.2.0
|
||||||
|
##
|
||||||
|
{ 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'],
|
||||||
|
'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X)' }
|
||||||
|
|
5
qmp.c
5
qmp.c
|
@ -605,11 +605,6 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename,
|
||||||
return prop_list;
|
return prop_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
|
|
||||||
{
|
|
||||||
return arch_query_cpu_definitions(errp);
|
|
||||||
}
|
|
||||||
|
|
||||||
void qmp_add_client(const char *protocol, const char *fdname,
|
void qmp_add_client(const char *protocol, const char *fdname,
|
||||||
bool has_skipauth, bool skipauth, bool has_tls, bool tls,
|
bool has_skipauth, bool skipauth, bool has_tls, bool tls,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
stub-obj-y += arch-query-cpu-def.o
|
|
||||||
stub-obj-y += bdrv-next-monitor-owned.o
|
stub-obj-y += bdrv-next-monitor-owned.o
|
||||||
stub-obj-y += blk-commit-all.o
|
stub-obj-y += blk-commit-all.o
|
||||||
stub-obj-y += blockdev-close-all-bdrv-states.o
|
stub-obj-y += blockdev-close-all-bdrv-states.o
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
#include "qemu/osdep.h"
|
|
||||||
#include "qemu-common.h"
|
|
||||||
#include "sysemu/arch_init.h"
|
|
||||||
#include "qapi/error.h"
|
|
||||||
#include "qapi/qmp/qerror.h"
|
|
||||||
|
|
||||||
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
|
|
||||||
{
|
|
||||||
error_setg(errp, QERR_UNSUPPORTED);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "sysemu/kvm.h"
|
#include "sysemu/kvm.h"
|
||||||
#include "fpu/softfloat.h"
|
#include "fpu/softfloat.h"
|
||||||
#include "qemu/range.h"
|
#include "qemu/range.h"
|
||||||
|
#include "qapi/qapi-commands-target.h"
|
||||||
|
|
||||||
#define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */
|
#define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */
|
||||||
|
|
||||||
|
@ -6733,7 +6734,7 @@ static void arm_cpu_add_definition(gpointer data, gpointer user_data)
|
||||||
*cpu_list = entry;
|
*cpu_list = entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
|
CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
|
||||||
{
|
{
|
||||||
CpuDefinitionInfoList *cpu_list = NULL;
|
CpuDefinitionInfoList *cpu_list = NULL;
|
||||||
GSList *list;
|
GSList *list;
|
||||||
|
|
|
@ -3791,7 +3791,7 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data)
|
||||||
*cpu_list = entry;
|
*cpu_list = entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
|
CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
|
||||||
{
|
{
|
||||||
CpuDefinitionInfoList *cpu_list = NULL;
|
CpuDefinitionInfoList *cpu_list = NULL;
|
||||||
GSList *list = get_sorted_cpu_model_list();
|
GSList *list = get_sorted_cpu_model_list();
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include "qemu/cutils.h"
|
#include "qemu/cutils.h"
|
||||||
#include "disas/capstone.h"
|
#include "disas/capstone.h"
|
||||||
#include "fpu/softfloat.h"
|
#include "fpu/softfloat.h"
|
||||||
|
#include "qapi/qapi-commands-target.h"
|
||||||
|
|
||||||
//#define PPC_DUMP_CPU
|
//#define PPC_DUMP_CPU
|
||||||
//#define PPC_DEBUG_SPR
|
//#define PPC_DEBUG_SPR
|
||||||
|
@ -10201,7 +10202,7 @@ static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)
|
||||||
*first = entry;
|
*first = entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
|
CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
|
||||||
{
|
{
|
||||||
CpuDefinitionInfoList *cpu_list = NULL;
|
CpuDefinitionInfoList *cpu_list = NULL;
|
||||||
GSList *list;
|
GSList *list;
|
||||||
|
|
|
@ -433,7 +433,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque)
|
||||||
*cpu_list = entry;
|
*cpu_list = entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
|
CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
|
||||||
{
|
{
|
||||||
struct CpuDefinitionInfoListData list_data = {
|
struct CpuDefinitionInfoListData list_data = {
|
||||||
.list = NULL,
|
.list = NULL,
|
||||||
|
|
Loading…
Reference in a new issue