qom/object: add some interface asserts

[Qemu-devel] [PATCH] qom/object: add some interface asserts

Marc-André Lureau posted 1 patch 7 years, 4 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20180912125303.29158-1-marcandre.lureau@redhat.com

Test docker-clang@ubuntu failed

Test checkpatch passed

qom/object.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] qom/object: add some interface asserts

Posted by Marc-André Lureau 7 years, 4 months ago

An interface can't have any instance size or callback, or itself
implement other interfaces (this is unsupported).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qom/object.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/qom/object.c b/qom/object.c
index 75d1d48944..9222b23172 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -286,7 +286,14 @@ static void type_initialize(TypeImpl *ti)
     if (ti->instance_size == 0) {
         ti->abstract = true;
     }
-
+    if (type_is_ancestor(ti, type_interface)) {
+        assert(ti->instance_size == 0);
+        assert(ti->abstract);
+        assert(!ti->instance_init);
+        assert(!ti->instance_post_init);
+        assert(!ti->instance_finalize);
+        assert(!ti->num_interfaces);
+    }
     ti->class = g_malloc0(ti->class_size);
 
     parent = type_get_parent(ti);
-- 
2.19.0.rc1

Re: [Qemu-devel] [PATCH] qom/object: add some interface asserts

Posted by Paolo Bonzini 7 years, 4 months ago

On 12/09/2018 14:53, Marc-André Lureau wrote:
> An interface can't have any instance size or callback, or itself
> implement other interfaces (this is unsupported).
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  qom/object.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/qom/object.c b/qom/object.c
> index 75d1d48944..9222b23172 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -286,7 +286,14 @@ static void type_initialize(TypeImpl *ti)
>      if (ti->instance_size == 0) {
>          ti->abstract = true;
>      }
> -
> +    if (type_is_ancestor(ti, type_interface)) {
> +        assert(ti->instance_size == 0);
> +        assert(ti->abstract);
> +        assert(!ti->instance_init);
> +        assert(!ti->instance_post_init);
> +        assert(!ti->instance_finalize);
> +        assert(!ti->num_interfaces);
> +    }
>      ti->class = g_malloc0(ti->class_size);
>  
>      parent = type_get_parent(ti);
> 

Queued, thanks.

Paolo