Commit a6421530 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'bonzini/qdev-props-for-anthony' into staging 

* bonzini/qdev-props-for-anthony: (25 commits)
  qdev: remove unused fields from PropertyInfo
  qdev: initialize properties via QOM
  qdev: inline qdev_prop_set into qdev_prop_set_ptr
  qdev: access properties via QOM
  qdev: fix off-by-one
  qdev: let QOM free properties
  qdev: remove parse/print methods for pointer properties
  qdev: make the non-legacy pci address property accept an integer
  qdev: remove parse/print methods for mac properties
  qdev: remove print/parse methods from LostTickPolicy properties
  qdev: remove parse method for string properties
  qdev: allow reusing get/set for legacy property
  qdev: remove direct calls to print/parse
  qom: add property get/set wrappers for links
  qom: fix canonical paths vs. interfaces
  qom: use object_resolve_path_type for links
  qom: add object_resolve_path_type
  qom: fix off-by-one
  qom: add property get/set wrappers for C types
  qom: add QObject-based property get/set wrappers
  ...
parents dc717bfd a3d4a1b0

hw/qdev-addr.c

+4 −3
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ static void set_taddr(Object *obj, Visitor *v, void *opaque, 


PropertyInfo qdev_prop_taddr = {

    .name  = "taddr",

    .type  = PROP_TYPE_TADDR,

    .size  = sizeof(target_phys_addr_t),

    .parse = parse_taddr,

    .print = print_taddr,

    .get   = get_taddr,
@@ -71,5 +69,8 @@ PropertyInfo qdev_prop_taddr = { 


void qdev_prop_set_taddr(DeviceState *dev, const char *name, target_phys_addr_t value)

{

    qdev_prop_set(dev, name, &value, PROP_TYPE_TADDR);

    Error *errp = NULL;

    object_property_set_int(OBJECT(dev), value, name, &errp);

    assert(!errp);



}

hw/qdev-monitor.c

+17 −13
Original line number Diff line number Diff line
@@ -485,22 +485,26 @@ static void qbus_print(Monitor *mon, BusState *bus, int indent); 
static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props,

                             const char *prefix, int indent)

{

    char buf[64];



    if (!props)

        return;

    while (props->name) {

        /*

         * TODO Properties without a print method are just for dirty

         * hacks.  qdev_prop_ptr is the only such PropertyInfo.  It's

         * marked for removal.  The test props->info->print should be

         * removed along with it.

         */

        if (props->info->print) {

            props->info->print(dev, props, buf, sizeof(buf));

            qdev_printf("%s-prop: %s = %s\n", prefix, props->name, buf);

    for (; props->name; props++) {

        Error *err = NULL;

        char *value;

        char *legacy_name = g_strdup_printf("legacy-%s", props->name);

        if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) {

            value = object_property_get_str(OBJECT(dev), legacy_name, &err);

        } else {

            value = object_property_get_str(OBJECT(dev), props->name, &err);

        }

        g_free(legacy_name);



        if (err) {

            error_free(err);

            continue;

        }

        props++;

        qdev_printf("%s-prop: %s = %s\n", prefix, props->name,

                    value && *value ? value : "<null>");

        g_free(value);

    }

}

hw/qdev-properties.c

+254 −256

File changed.

Preview size limit exceeded, changes collapsed.

hw/qdev.c

+19 −13
Original line number Diff line number Diff line
@@ -86,11 +86,11 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *bus) 
    dev->parent_bus = bus;

    QTAILQ_INSERT_HEAD(&bus->children, dev, sibling);



    qdev_prop_set_defaults(dev, dev->parent_bus->info->props);

    for (prop = qdev_get_bus_info(dev)->props; prop && prop->name; prop++) {

        qdev_property_add_legacy(dev, prop, NULL);

        qdev_property_add_static(dev, prop, NULL);

    }

    qdev_prop_set_defaults(dev, dev->parent_bus->info->props);

}



/* Create a new device.  This only initializes the device state structure
@@ -550,21 +550,24 @@ static void qdev_set_legacy_property(Object *obj, Visitor *v, void *opaque, 
 * Do not use this is new code!  Properties added through this interface will

 * be given names and types in the "legacy" namespace.

 *

 * Legacy properties are always processed as strings.  The format of the string

 * depends on the property type.

 * Legacy properties are string versions of other OOM properties.  The format

 * of the string depends on the property type.

 */

void qdev_property_add_legacy(DeviceState *dev, Property *prop,

                              Error **errp)

{

    gchar *name, *type;



    if (!prop->info->print && !prop->info->parse) {

        return;

    }

    name = g_strdup_printf("legacy-%s", prop->name);

    type = g_strdup_printf("legacy<%s>",

                           prop->info->legacy_name ?: prop->info->name);



    object_property_add(OBJECT(dev), name, type,

                        prop->info->print ? qdev_get_legacy_property : NULL,

                        prop->info->parse ? qdev_set_legacy_property : NULL,

                        prop->info->print ? qdev_get_legacy_property : prop->info->get,

                        prop->info->parse ? qdev_set_legacy_property : prop->info->set,

                        NULL,

                        prop, errp);
@@ -581,9 +584,18 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop, 
void qdev_property_add_static(DeviceState *dev, Property *prop,

                              Error **errp)

{

    /*

     * TODO qdev_prop_ptr does not have getters or setters.  It must

     * go now that it can be replaced with links.  The test should be

     * removed along with it: all static properties are read/write.

     */

    if (!prop->info->get && !prop->info->set) {

        return;

    }



    object_property_add(OBJECT(dev), prop->name, prop->info->name,

                        prop->info->get, prop->info->set,

                        NULL,

                        prop->info->release,

                        prop, errp);

}
@@ -600,13 +612,13 @@ static void device_initfn(Object *obj) 
    dev->instance_id_alias = -1;

    dev->state = DEV_STATE_CREATED;



    qdev_prop_set_defaults(dev, qdev_get_props(dev));

    for (prop = qdev_get_props(dev); prop && prop->name; prop++) {

        qdev_property_add_legacy(dev, prop, NULL);

        qdev_property_add_static(dev, prop, NULL);

    }



    object_property_add_str(OBJECT(dev), "type", qdev_get_type, NULL, NULL);

    qdev_prop_set_defaults(dev, qdev_get_props(dev));

}



/* Unlink device from bus and free the structure.  */
@@ -614,7 +626,6 @@ static void device_finalize(Object *obj) 
{

    DeviceState *dev = DEVICE(obj);

    BusState *bus;

    Property *prop;

    DeviceClass *dc = DEVICE_GET_CLASS(dev);



    if (dev->state == DEV_STATE_INITIALIZED) {
@@ -633,11 +644,6 @@ static void device_finalize(Object *obj) 
        }

    }

    QTAILQ_REMOVE(&dev->parent_bus->children, dev, sibling);

    for (prop = qdev_get_props(dev); prop && prop->name; prop++) {

        if (prop->info->free) {

            prop->info->free(dev, prop);

        }

    }

}



void device_reset(DeviceState *dev)

hw/qdev.h

+10 −29
Original line number Diff line number Diff line
@@ -112,41 +112,22 @@ struct Property { 
    const char   *name;

    PropertyInfo *info;

    int          offset;

    int          bitnr;

    void         *defval;

};



enum PropertyType {

    PROP_TYPE_UNSPEC = 0,

    PROP_TYPE_UINT8,

    PROP_TYPE_UINT16,

    PROP_TYPE_UINT32,

    PROP_TYPE_INT32,

    PROP_TYPE_UINT64,

    PROP_TYPE_TADDR,

    PROP_TYPE_MACADDR,

    PROP_TYPE_LOSTTICKPOLICY,

    PROP_TYPE_DRIVE,

    PROP_TYPE_CHR,

    PROP_TYPE_STRING,

    PROP_TYPE_NETDEV,

    PROP_TYPE_VLAN,

    PROP_TYPE_PTR,

    PROP_TYPE_BIT,

    uint8_t      bitnr;

    uint8_t      qtype;

    int64_t      defval;

};



struct PropertyInfo {

    const char *name;

    const char *legacy_name;

    size_t size;

    enum PropertyType type;

    const char **enum_table;

    int64_t min;

    int64_t max;

    int (*parse)(DeviceState *dev, Property *prop, const char *str);

    int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len);

    void (*free)(DeviceState *dev, Property *prop);

    ObjectPropertyAccessor *get;

    ObjectPropertyAccessor *set;

    ObjectPropertyRelease *release;

};



typedef struct GlobalProperty {
@@ -254,7 +235,8 @@ extern PropertyInfo qdev_prop_pci_devfn; 
        .info      = &(_prop),                                          \

        .offset    = offsetof(_state, _field)                           \

            + type_check(_type,typeof_field(_state, _field)),           \

        .defval    = (_type[]) { _defval },                             \

        .qtype     = QTYPE_QINT,                                        \

        .defval    = (_type)_defval,                                    \

        }

#define DEFINE_PROP_BIT(_name, _state, _field, _bit, _defval) {  \

        .name      = (_name),                                    \
@@ -262,7 +244,8 @@ extern PropertyInfo qdev_prop_pci_devfn; 
        .bitnr    = (_bit),                                      \

        .offset    = offsetof(_state, _field)                    \

            + type_check(uint32_t,typeof_field(_state, _field)), \

        .defval    = (bool[]) { (_defval) },                     \

        .qtype     = QTYPE_QBOOL,                                \

        .defval    = (bool)_defval,                              \

        }



#define DEFINE_PROP_UINT8(_n, _s, _f, _d)                       \
@@ -309,7 +292,6 @@ extern PropertyInfo qdev_prop_pci_devfn; 
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop);

int qdev_prop_exists(DeviceState *dev, const char *name);

int qdev_prop_parse(DeviceState *dev, const char *name, const char *value);

void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type);

void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value);

void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t value);

void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value);
@@ -323,8 +305,7 @@ void qdev_prop_set_vlan(DeviceState *dev, const char *name, VLANState *value); 
int qdev_prop_set_drive(DeviceState *dev, const char *name, BlockDriverState *value) QEMU_WARN_UNUSED_RESULT;

void qdev_prop_set_drive_nofail(DeviceState *dev, const char *name, BlockDriverState *value);

void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value);

void qdev_prop_set_losttickpolicy(DeviceState *dev, const char *name,

                                  LostTickPolicy *value);

void qdev_prop_set_enum(DeviceState *dev, const char *name, int value);

/* FIXME: Remove opaque pointer properties.  */

void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);

void qdev_prop_set_defaults(DeviceState *dev, Property *props);