Commit 3650b2de authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Eduardo Habkost
Browse files

qom: make user_creatable_complete() specific to UserCreatable 



Instead of accepting any Object*, change user_creatable_complete() to
require a UserCreatable*. Modify the callers to pass the appropriate
argument, removing redundant dynamic cast checks in object creation.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20181204142023.15982-4-marcandre.lureau@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent aa1b35b9

hw/misc/ivshmem.c

+1 −1
Original line number Diff line number Diff line
@@ -1280,7 +1280,7 @@ static void desugar_shm(IVShmemState *s) 
    object_property_add_child(OBJECT(s), "internal-shm-backend", obj,

                              &error_abort);

    object_unref(obj);

    user_creatable_complete(obj, &error_abort);

    user_creatable_complete(USER_CREATABLE(obj), &error_abort);

    s->hostmem = MEMORY_BACKEND(obj);

}

hw/virtio/virtio-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) 
    if (vrng->conf.rng == NULL) {

        vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM));



        user_creatable_complete(OBJECT(vrng->conf.default_backend),

        user_creatable_complete(USER_CREATABLE(vrng->conf.default_backend),

                                &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

include/qom/object_interfaces.h

+2 −2
Original line number Diff line number Diff line
@@ -51,14 +51,14 @@ typedef struct UserCreatableClass { 


/**

 * user_creatable_complete:

 * @obj: the object whose complete() method is called if defined

 * @uc: the user-creatable object whose complete() method is called if defined

 * @errp: if an error occurs, a pointer to an area to store the error

 *

 * Wrapper to call complete() method if one of types it's inherited

 * from implements USER_CREATABLE interface, otherwise the call does

 * nothing.

 */

void user_creatable_complete(Object *obj, Error **errp);

void user_creatable_complete(UserCreatable *uc, Error **errp);



/**

 * user_creatable_can_be_deleted:

qom/object.c

+8 −4
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ void object_initialize_childv(Object *parentobj, const char *propname, 
{

    Error *local_err = NULL;

    Object *obj;

    UserCreatable *uc;



    object_initialize(childobj, size, type);

    obj = OBJECT(childobj);
@@ -431,8 +432,9 @@ void object_initialize_childv(Object *parentobj, const char *propname, 
        goto out;

    }



    if (object_dynamic_cast(obj, TYPE_USER_CREATABLE)) {

        user_creatable_complete(obj, &local_err);

    uc = (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE);

    if (uc) {

        user_creatable_complete(uc, &local_err);

        if (local_err) {

            object_unparent(obj);

            goto out;
@@ -590,6 +592,7 @@ Object *object_new_with_propv(const char *typename, 
    Object *obj;

    ObjectClass *klass;

    Error *local_err = NULL;

    UserCreatable *uc;



    klass = object_class_by_name(typename);

    if (!klass) {
@@ -612,8 +615,9 @@ Object *object_new_with_propv(const char *typename, 
        goto error;

    }



    if (object_dynamic_cast(obj, TYPE_USER_CREATABLE)) {

        user_creatable_complete(obj, &local_err);

    uc = (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE);

    if (uc) {

        user_creatable_complete(uc, &local_err);

        if (local_err) {

            object_unparent(obj);

            goto error;

qom/object_interfaces.c

+3 −11
Original line number Diff line number Diff line
@@ -8,18 +8,10 @@ 
#include "qapi/opts-visitor.h"

#include "qemu/config-file.h"



void user_creatable_complete(Object *obj, Error **errp)

void user_creatable_complete(UserCreatable *uc, Error **errp)

{

    UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);



    UserCreatableClass *ucc;

    UserCreatable *uc =

        (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE);



    if (!uc) {

        return;

    }



    ucc = USER_CREATABLE_GET_CLASS(uc);

    if (ucc->complete) {

        ucc->complete(uc, errp);

    }
@@ -89,7 +81,7 @@ Object *user_creatable_add_type(const char *type, const char *id, 
        goto out;

    }



    user_creatable_complete(obj, &local_err);

    user_creatable_complete(USER_CREATABLE(obj), &local_err);

    if (local_err) {

        object_property_del(object_get_objects_root(),

                            id, &error_abort);