Skip to content
  • Markus Armbruster's avatar
    9fc7fc4d
    qom: Less verbose object_initialize_child() · 9fc7fc4d
    Markus Armbruster authored
    
    
    All users of object_initialize_child() pass the obvious child size
    argument.  Almost all pass &error_abort and no properties.  Tiresome.
    
    Rename object_initialize_child() to
    object_initialize_child_with_props() to free the name.  New
    convenience wrapper object_initialize_child() automates the size
    argument, and passes &error_abort and no properties.
    
    Rename object_initialize_childv() to
    object_initialize_child_with_propsv() for consistency.
    
    Convert callers with this Coccinelle script:
    
        @@
        expression parent, propname, type;
        expression child, size;
        symbol error_abort;
        @@
        -    object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL)
        +    object_initialize_child(parent, propname, child, size, type, &error_abort, NULL)
    
        @@
        expression parent, propname, type;
        expression child;
        symbol error_abort;
        @@
        -    object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL)
        +    object_initialize_child(parent, propname, child, type)
    
        @@
        expression parent, propname, type;
        expression child;
        symbol error_abort;
        @@
        -    object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL)
        +    object_initialize_child(parent, propname, &child, type)
    
        @@
        expression parent, propname, type;
        expression child, size, err;
        expression list props;
        @@
        -    object_initialize_child(parent, propname, child, size, type, err, props)
        +    object_initialize_child_with_props(parent, propname, child, size, type, err, props)
    
    Note that Coccinelle chokes on ARMSSE typedef vs. macro in
    hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
    the spatch run.
    
    Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
    Acked-by: default avatarAlistair Francis <alistair.francis@wdc.com>
    [Rebased: machine opentitan is new (commit fe0fe473)]
    Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Message-Id: <20200610053247.1583243-37-armbru@redhat.com>
    9fc7fc4d
    qom: Less verbose object_initialize_child()
    Markus Armbruster authored
    
    
    All users of object_initialize_child() pass the obvious child size
    argument.  Almost all pass &error_abort and no properties.  Tiresome.
    
    Rename object_initialize_child() to
    object_initialize_child_with_props() to free the name.  New
    convenience wrapper object_initialize_child() automates the size
    argument, and passes &error_abort and no properties.
    
    Rename object_initialize_childv() to
    object_initialize_child_with_propsv() for consistency.
    
    Convert callers with this Coccinelle script:
    
        @@
        expression parent, propname, type;
        expression child, size;
        symbol error_abort;
        @@
        -    object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL)
        +    object_initialize_child(parent, propname, child, size, type, &error_abort, NULL)
    
        @@
        expression parent, propname, type;
        expression child;
        symbol error_abort;
        @@
        -    object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL)
        +    object_initialize_child(parent, propname, child, type)
    
        @@
        expression parent, propname, type;
        expression child;
        symbol error_abort;
        @@
        -    object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL)
        +    object_initialize_child(parent, propname, &child, type)
    
        @@
        expression parent, propname, type;
        expression child, size, err;
        expression list props;
        @@
        -    object_initialize_child(parent, propname, child, size, type, err, props)
        +    object_initialize_child_with_props(parent, propname, child, size, type, err, props)
    
    Note that Coccinelle chokes on ARMSSE typedef vs. macro in
    hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
    the spatch run.
    
    Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
    Acked-by: default avatarAlistair Francis <alistair.francis@wdc.com>
    [Rebased: machine opentitan is new (commit fe0fe473)]
    Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Message-Id: <20200610053247.1583243-37-armbru@redhat.com>
Loading