Commit ff46d9d4 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

qdev: Remove DeviceClass::init() and ::exit() 



Since no devices use it, we can safely remove it.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180419212727.26095-5-f4bug@amsat.org>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
[Removal of DeviceClass::init() moved from previous patch, missing
documentation updates supplied]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20180528144509.15812-5-armbru@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent dbfe0013

hw/core/qdev.c

+0 −28
Original line number Diff line number Diff line
@@ -208,32 +208,6 @@ void device_listener_unregister(DeviceListener *listener) 
    QTAILQ_REMOVE(&device_listeners, listener, link);

}



static void device_realize(DeviceState *dev, Error **errp)

{

    DeviceClass *dc = DEVICE_GET_CLASS(dev);



    if (dc->init) {

        int rc = dc->init(dev);

        if (rc < 0) {

            error_setg(errp, "Device initialization failed.");

            return;

        }

    }

}



static void device_unrealize(DeviceState *dev, Error **errp)

{

    DeviceClass *dc = DEVICE_GET_CLASS(dev);



    if (dc->exit) {

        int rc = dc->exit(dev);

        if (rc < 0) {

            error_setg(errp, "Device exit failed.");

            return;

        }

    }

}



void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,

                                 int required_for_version)

{
@@ -1065,8 +1039,6 @@ static void device_class_init(ObjectClass *class, void *data) 
    DeviceClass *dc = DEVICE_CLASS(class);



    class->unparent = device_unparent;

    dc->realize = device_realize;

    dc->unrealize = device_unrealize;



    /* by default all devices were considered as hotpluggable,

     * so with intent to check it in generic qdev_unplug() /

include/hw/qdev-core.h

+4 −16
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ typedef enum DeviceCategory { 
    DEVICE_CATEGORY_MAX

} DeviceCategory;



typedef int (*qdev_initfn)(DeviceState *dev);

typedef int (*qdev_event)(DeviceState *dev);

typedef void (*DeviceRealize)(DeviceState *dev, Error **errp);

typedef void (*DeviceUnrealize)(DeviceState *dev, Error **errp);

typedef void (*DeviceReset)(DeviceState *dev);
@@ -43,13 +41,9 @@ struct VMStateDescription; 
 * DeviceClass:

 * @props: Properties accessing state fields.

 * @realize: Callback function invoked when the #DeviceState:realized

 * property is changed to %true. The default invokes @init if not %NULL.

 * property is changed to %true.

 * @unrealize: Callback function invoked when the #DeviceState:realized

 * property is changed to %false.

 * @init: Callback function invoked when the #DeviceState::realized property

 * is changed to %true. Deprecated, new types inheriting directly from

 * TYPE_DEVICE should use @realize instead, new leaf types should consult

 * their respective parent type.

 * @hotpluggable: indicates if #DeviceClass is hotpluggable, available

 * as readonly "hotpluggable" property of #DeviceState instance

 *
@@ -73,19 +67,15 @@ struct VMStateDescription; 
 * object_initialize() in their own #TypeInfo.instance_init and forward the

 * realization events appropriately.

 *

 * The @init callback is considered private to a particular bus implementation

 * (immediate abstract child types of TYPE_DEVICE). Derived leaf types set an

 * "init" callback on their parent class instead.

 *

 * Any type may override the @realize and/or @unrealize callbacks but needs

 * to call the parent type's implementation if keeping their functionality

 * is desired. Refer to QOM documentation for further discussion and examples.

 *

 * <note>

 *   <para>

 * If a type derived directly from TYPE_DEVICE implements @realize, it does

 * not need to implement @init and therefore does not need to store and call

 * #DeviceClass' default @realize callback.

 * Since TYPE_DEVICE doesn't implement @realize and @unrealize, types

 * derived directly from it need not call their parent's @realize and

 * @unrealize.

 * For other types consult the documentation and implementation of the

 * respective parent types.

 *   </para>
@@ -124,8 +114,6 @@ typedef struct DeviceClass { 
    const struct VMStateDescription *vmsd;



    /* Private to qdev / bus.  */

    qdev_initfn init; /* TODO remove, once users are converted to realize */

    qdev_event exit; /* TODO remove, once users are converted to unrealize */

    const char *bus_type;

} DeviceClass;