Commit 35f63767 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Paolo Bonzini
Browse files

qmp: Merge ObjectPropertyInfo and DevicePropertyInfo 



ObjectPropertyInfo is more generic and only missing @description.
This adds a description to ObjectPropertyInfo and removes
DevicePropertyInfo so the resulting ObjectPropertyInfo can be used
elsewhere.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Message-Id: <20180301130939.15875-2-aik@ozlabs.ru>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f29d4450

qapi/misc.json

+5 −18
Original line number Diff line number Diff line
@@ -1285,10 +1285,12 @@ 
#        3) A link type in the form 'link<subtype>' where subtype is a qdev

#           device type name.  Link properties form the device model graph.

#

# @description: if specified, the description of the property.

#

# Since: 1.2

##

{ 'struct': 'ObjectPropertyInfo',

  'data': { 'name': 'str', 'type': 'str' } }

  'data': { 'name': 'str', 'type': 'str', '*description': 'str' } }



##

# @qom-list:
@@ -1443,21 +1445,6 @@ 
  'data': { '*implements': 'str', '*abstract': 'bool' },

  'returns': [ 'ObjectTypeInfo' ] }



##

# @DevicePropertyInfo:

#

# Information about device properties.

#

# @name: the name of the property

# @type: the typename of the property

# @description: if specified, the description of the property.

#               (since 2.2)

#

# Since: 1.2

##

{ 'struct': 'DevicePropertyInfo',

  'data': { 'name': 'str', 'type': 'str', '*description': 'str' } }



##

# @device-list-properties:

#
@@ -1465,13 +1452,13 @@ 
#

# @typename: the type name of a device

#

# Returns: a list of DevicePropertyInfo describing a devices properties

# Returns: a list of ObjectPropertyInfo describing a devices properties

#

# Since: 1.2

##

{ 'command': 'device-list-properties',

  'data': { 'typename': 'str'},

  'returns': [ 'DevicePropertyInfo' ] }

  'returns': [ 'ObjectPropertyInfo' ] }



##

# @xen-set-global-dirty-log:

qdev-monitor.c

+3 −3
Original line number Diff line number Diff line
@@ -258,8 +258,8 @@ int qdev_device_help(QemuOpts *opts) 
{

    Error *local_err = NULL;

    const char *driver;

    DevicePropertyInfoList *prop_list;

    DevicePropertyInfoList *prop;

    ObjectPropertyInfoList *prop_list;

    ObjectPropertyInfoList *prop;



    driver = qemu_opt_get(opts, "driver");

    if (driver && is_help_option(driver)) {
@@ -295,7 +295,7 @@ int qdev_device_help(QemuOpts *opts) 
        }

    }



    qapi_free_DevicePropertyInfoList(prop_list);

    qapi_free_ObjectPropertyInfoList(prop_list);

    return 1;



error:

qmp.c

+10 −10
Original line number Diff line number Diff line
@@ -465,12 +465,12 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_implements, 
 *

 * The caller must free the return value.

 */

static DevicePropertyInfo *make_device_property_info(ObjectClass *klass,

static ObjectPropertyInfo *make_device_property_info(ObjectClass *klass,

                                                  const char *name,

                                                  const char *default_type,

                                                  const char *description)

{

    DevicePropertyInfo *info;

    ObjectPropertyInfo *info;

    Property *prop;



    do {
@@ -510,14 +510,14 @@ static DevicePropertyInfo *make_device_property_info(ObjectClass *klass, 
    return info;

}



DevicePropertyInfoList *qmp_device_list_properties(const char *typename,

ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,

                                                Error **errp)

{

    ObjectClass *klass;

    Object *obj;

    ObjectProperty *prop;

    ObjectPropertyIterator iter;

    DevicePropertyInfoList *prop_list = NULL;

    ObjectPropertyInfoList *prop_list = NULL;



    klass = object_class_by_name(typename);

    if (klass == NULL) {
@@ -542,8 +542,8 @@ DevicePropertyInfoList *qmp_device_list_properties(const char *typename, 


    object_property_iter_init(&iter, obj);

    while ((prop = object_property_iter_next(&iter))) {

        DevicePropertyInfo *info;

        DevicePropertyInfoList *entry;

        ObjectPropertyInfo *info;

        ObjectPropertyInfoList *entry;



        /* Skip Object and DeviceState properties */

        if (strcmp(prop->name, "type") == 0 ||