Commit 0a3346f5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging 



QOM infrastructure fixes and device conversions

* Changes to name string ownership for alias properties
* Improvements around enum properties
* Cleanups around -object handling
* New helper functions
* Cleanups of qdev init helper functions
* Add path argument to qom-tree script
* QTest cleanup to use new qtest_add_data_func() consistently

# gpg: Signature made Fri Jun 19 18:14:38 2015 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-peter:
  qdev: Un-deprecate qdev_init_nofail()
  qdev: Deprecated qdev_init() is finally unused, drop
  qom: Don't pass string table to object_get_enum() function
  qom: Add an object_property_add_enum() helper function
  qom: Make enum string tables const-correct
  qom: Add object_new_with_props() / object_new_withpropv() helpers
  qom: Add helper function for getting user objects root
  vl: Create (most) objects before creating chardev backends
  doc: Document user creatable object types in help text
  backends: Fix typename of 'policy' enum property in hostmem obj
  scripts: Add support for path as argument of qom-tree
  tests: Use qtest_add_data_func() consistently
  qdev: Free property names after registering gpio aliases
  qom: strdup() target property name on object_property_add_alias()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cb4e0f9d daeba969

backends/hostmem.c

+8 −14
Original line number Diff line number Diff line
@@ -113,24 +113,17 @@ host_memory_backend_set_host_nodes(Object *obj, Visitor *v, void *opaque, 
#endif

}



static void

host_memory_backend_get_policy(Object *obj, Visitor *v, void *opaque,

                               const char *name, Error **errp)

static int

host_memory_backend_get_policy(Object *obj, Error **errp G_GNUC_UNUSED)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    int policy = backend->policy;



    visit_type_enum(v, &policy, HostMemPolicy_lookup, NULL, name, errp);

    return backend->policy;

}



static void

host_memory_backend_set_policy(Object *obj, Visitor *v, void *opaque,

                               const char *name, Error **errp)

host_memory_backend_set_policy(Object *obj, int policy, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    int policy;



    visit_type_enum(v, &policy, HostMemPolicy_lookup, NULL, name, errp);

    backend->policy = policy;



#ifndef CONFIG_NUMA
@@ -252,9 +245,10 @@ static void host_memory_backend_init(Object *obj) 
    object_property_add(obj, "host-nodes", "int",

                        host_memory_backend_get_host_nodes,

                        host_memory_backend_set_host_nodes, NULL, NULL, NULL);

    object_property_add(obj, "policy", "str",

    object_property_add_enum(obj, "policy", "HostMemPolicy",

                             HostMemPolicy_lookup,

                             host_memory_backend_get_policy,

                        host_memory_backend_set_policy, NULL, NULL, NULL);

                             host_memory_backend_set_policy, NULL);

}



MemoryRegion *

hw/core/qdev.c

+18 −31
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ void qbus_set_bus_hotplug_handler(BusState *bus, Error **errp) 
    qbus_set_hotplug_handler_internal(bus, OBJECT(bus), errp);

}



/* Create a new device.  This only initializes the device state structure

   and allows properties to be set.  qdev_init should be called to

   initialize the actual device emulation.  */

/* Create a new device.  This only initializes the device state

   structure and allows properties to be set.  The device still needs

   to be realized.  See qdev-core.h.  */

DeviceState *qdev_create(BusState *bus, const char *name)

{

    DeviceState *dev;
@@ -168,27 +168,6 @@ DeviceState *qdev_try_create(BusState *bus, const char *type) 
    return dev;

}



/* Initialize a device.  Device properties should be set before calling

   this function.  IRQs and MMIO regions should be connected/mapped after

   calling this function.

   On failure, destroy the device and return negative value.

   Return 0 on success.  */

int qdev_init(DeviceState *dev)

{

    Error *local_err = NULL;



    assert(!dev->realized);



    object_property_set_bool(OBJECT(dev), true, "realized", &local_err);

    if (local_err != NULL) {

        qerror_report_err(local_err);

        error_free(local_err);

        object_unparent(OBJECT(dev));

        return -1;

    }

    return 0;

}



static QTAILQ_HEAD(device_listeners, DeviceListener) device_listeners

    = QTAILQ_HEAD_INITIALIZER(device_listeners);
@@ -364,13 +343,19 @@ void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, 
    object_unparent(OBJECT(dev));

}



/* Like qdev_init(), but terminate program via error_report() instead of

   returning an error value.  This is okay during machine creation.

   Don't use for hotplug, because there callers need to recover from

   failure.  Exception: if you know the device's init() callback can't

   fail, then qdev_init_nofail() can't fail either, and is therefore

   usable even then.  But relying on the device implementation that

   way is somewhat unclean, and best avoided.  */

/*

 * Realize @dev.

 * Device properties should be set before calling this function.  IRQs

 * and MMIO regions should be connected/mapped after calling this

 * function.

 * On failure, report an error with error_report() and terminate the

 * program.  This is okay during machine creation.  Don't use for

 * hotplug, because there callers need to recover from failure.

 * Exception: if you know the device's init() callback can't fail,

 * then qdev_init_nofail() can't fail either, and is therefore usable

 * even then.  But relying on the device implementation that way is

 * somewhat unclean, and best avoided.

 */

void qdev_init_nofail(DeviceState *dev)

{

    Error *err = NULL;
@@ -563,6 +548,7 @@ void qdev_pass_gpios(DeviceState *dev, DeviceState *container, 
        object_property_add_alias(OBJECT(container), propname,

                                  OBJECT(dev), propname,

                                  &error_abort);

        g_free(propname);

    }

    for (i = 0; i < ngl->num_out; i++) {

        const char *nm = ngl->name ? ngl->name : "unnamed-gpio-out";
@@ -571,6 +557,7 @@ void qdev_pass_gpios(DeviceState *dev, DeviceState *container, 
        object_property_add_alias(OBJECT(container), propname,

                                  OBJECT(dev), propname,

                                  &error_abort);

        g_free(propname);

    }

    QLIST_REMOVE(ngl, node);

    QLIST_INSERT_HEAD(&container->gpios, ngl, node);

include/hw/qdev-core.h

+3 −4
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ struct VMStateDescription; 
 * Operations depending on @props static properties should go into @realize.

 * After successful realization, setting static properties will fail.

 *

 * As an interim step, the #DeviceState:realized property is set by deprecated

 * functions qdev_init() and qdev_init_nofail().

 * As an interim step, the #DeviceState:realized property can also be

 * set with qdev_init_nofail().

 * In the future, devices will propagate this state change to their children

 * and along busses they expose.

 * The point in time will be deferred to machine creation, so that values
@@ -236,7 +236,7 @@ struct Property { 
struct PropertyInfo {

    const char *name;

    const char *description;

    const char **enum_table;

    const char * const *enum_table;

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

    ObjectPropertyAccessor *get;

    ObjectPropertyAccessor *set;
@@ -262,7 +262,6 @@ typedef struct GlobalProperty { 


DeviceState *qdev_create(BusState *bus, const char *name);

DeviceState *qdev_try_create(BusState *bus, const char *name);

int qdev_init(DeviceState *dev) QEMU_WARN_UNUSED_RESULT;

void qdev_init_nofail(DeviceState *dev);

void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,

                                 int required_for_version);

include/qapi/util.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef QAPI_UTIL_H

#define QAPI_UTIL_H



int qapi_enum_parse(const char *lookup[], const char *buf,

int qapi_enum_parse(const char * const lookup[], const char *buf,

                    int max, int def, Error **errp);



#endif

include/qapi/visitor-impl.h

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct Visitor 
    GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp);

    void (*end_list)(Visitor *v, Error **errp);



    void (*type_enum)(Visitor *v, int *obj, const char *strings[],

    void (*type_enum)(Visitor *v, int *obj, const char * const strings[],

                      const char *kind, const char *name, Error **errp);

    void (*get_next_type)(Visitor *v, int *kind, const int *qobjects,

                          const char *name, Error **errp);
@@ -59,9 +59,9 @@ struct Visitor 
    void (*end_union)(Visitor *v, bool data_present, Error **errp);

};



void input_type_enum(Visitor *v, int *obj, const char *strings[],

void input_type_enum(Visitor *v, int *obj, const char * const strings[],

                     const char *kind, const char *name, Error **errp);

void output_type_enum(Visitor *v, int *obj, const char *strings[],

void output_type_enum(Visitor *v, int *obj, const char * const strings[],

                      const char *kind, const char *name, Error **errp);



#endif