ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20181204142023.15982-4-marcandre.lureau@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-12-04 18:20:07 +04:00 committed by Eduardo Habkost
parent aa1b35b975
commit 3650b2de34
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/misc/ivshmem.c
View File

@ -1280,7 +1280,7 @@ static void desugar_shm(IVShmemState *s)
object_property_add_child(OBJECT(s), "internal-shm-backend", obj, object_property_add_child(OBJECT(s), "internal-shm-backend", obj,
&error_abort); &error_abort);
object_unref(obj); object_unref(obj);
user_creatable_complete(obj, &error_abort); user_creatable_complete(USER_CREATABLE(obj), &error_abort);
s->hostmem = MEMORY_BACKEND(obj); s->hostmem = MEMORY_BACKEND(obj);
} }

2
hw/virtio/virtio-rng.c
View File

@ -191,7 +191,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp)
if (vrng->conf.rng == NULL) { if (vrng->conf.rng == NULL) {
vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); 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); &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);

4
include/qom/object_interfaces.h
View File

@ -51,14 +51,14 @@ typedef struct UserCreatableClass {
/** /**
* user_creatable_complete: * 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 * @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 * Wrapper to call complete() method if one of types it's inherited
* from implements USER_CREATABLE interface, otherwise the call does * from implements USER_CREATABLE interface, otherwise the call does
* nothing. * nothing.
*/ */
void user_creatable_complete(Object *obj, Error **errp); void user_creatable_complete(UserCreatable *uc, Error **errp);
/** /**
* user_creatable_can_be_deleted: * user_creatable_can_be_deleted:

12
qom/object.c
View File

@ -417,6 +417,7 @@ void object_initialize_childv(Object *parentobj, const char *propname,
{ {
Error *local_err = NULL; Error *local_err = NULL;
Object *obj; Object *obj;
UserCreatable *uc;
object_initialize(childobj, size, type); object_initialize(childobj, size, type);
obj = OBJECT(childobj); obj = OBJECT(childobj);
@ -431,8 +432,9 @@ void object_initialize_childv(Object *parentobj, const char *propname,
goto out; goto out;
} }
if (object_dynamic_cast(obj, TYPE_USER_CREATABLE)) { uc = (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE);
user_creatable_complete(obj, &local_err); if (uc) {
user_creatable_complete(uc, &local_err);
if (local_err) { if (local_err) {
object_unparent(obj); object_unparent(obj);
goto out; goto out;
@ -590,6 +592,7 @@ Object *object_new_with_propv(const char *typename,
Object *obj; Object *obj;
ObjectClass *klass; ObjectClass *klass;
Error *local_err = NULL; Error *local_err = NULL;
UserCreatable *uc;
klass = object_class_by_name(typename); klass = object_class_by_name(typename);
if (!klass) { if (!klass) {
@ -612,8 +615,9 @@ Object *object_new_with_propv(const char *typename,
goto error; goto error;
} }
if (object_dynamic_cast(obj, TYPE_USER_CREATABLE)) { uc = (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE);
user_creatable_complete(obj, &local_err); if (uc) {
user_creatable_complete(uc, &local_err);
if (local_err) { if (local_err) {
object_unparent(obj); object_unparent(obj);
goto error; goto error;

14
qom/object_interfaces.c
View File

@ -8,18 +8,10 @@
#include "qapi/opts-visitor.h" #include "qapi/opts-visitor.h"
#include "qemu/config-file.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) { if (ucc->complete) {
ucc->complete(uc, errp); ucc->complete(uc, errp);
} }
@ -89,7 +81,7 @@ Object *user_creatable_add_type(const char *type, const char *id,
goto out; goto out;
} }
user_creatable_complete(obj, &local_err); user_creatable_complete(USER_CREATABLE(obj), &local_err);
if (local_err) { if (local_err) {
object_property_del(object_get_objects_root(), object_property_del(object_get_objects_root(),
id, &error_abort); id, &error_abort);