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

qapi: make query-cpu-definitions depend on specific targets 



It depends on TARGET_PPC || TARGET_ARM || TARGET_I386 || TARGET_S390X.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190214152251.2073-15-armbru@redhat.com>
parent 96f75b59

include/sysemu/arch_init.h

+0 −1
Original line number Diff line number Diff line
@@ -32,5 +32,4 @@ extern const uint32_t arch_type; 
int kvm_available(void);

int xen_available(void);



CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp);

#endif

monitor.c

+0 −22
Original line number Diff line number Diff line
@@ -1131,26 +1131,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data, 
    *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)

{

    /*
@@ -1169,8 +1149,6 @@ static void monitor_init_qmp_commands(void) 
    qmp_register_command(&qmp_commands, "netdev_add", qmp_netdev_add,

                         QCO_NO_OPTIONS);



    qmp_unregister_commands_hack();



    QTAILQ_INIT(&qmp_cap_negotiation_commands);

    qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",

                         qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG);

qapi/misc.json

+0 −58
Original line number Diff line number Diff line
@@ -2057,54 +2057,6 @@ 
##

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

#
@@ -2137,16 +2089,6 @@ 
##

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

qapi/target.json

+64 −0
Original line number Diff line number Diff line
@@ -425,3 +425,67 @@ 
            'model': 'CpuModelInfo' },

  'returns': 'CpuModelExpansionInfo',

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

qmp.c

+0 −5
Original line number Diff line number Diff line
@@ -605,11 +605,6 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename, 
    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,

                    bool has_skipauth, bool skipauth, bool has_tls, bool tls,

                    Error **errp)