Skip to content
  • Markus Armbruster's avatar
    0074fce6
    sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1 · 0074fce6
    Markus Armbruster authored
    
    
    I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
    recent commit "qdev: Convert uses of qdev_set_parent_bus() with
    Coccinelle" explains why.
    
    sysbus_init_child_obj() is a wrapper around
    object_initialize_child_with_props() and qdev_set_parent_bus().  It
    passes no properties.
    
    Convert sysbus_init_child_obj()/realize to object_initialize_child()/
    qdev_realize().
    
    Coccinelle script:
    
        @@
        expression parent, name, size, type, errp;
        expression child;
        symbol true;
        @@
        -    sysbus_init_child_obj(parent, name, &child, size, type);
        +    sysbus_init_child_XXX(parent, name, &child, size, type);
             ...
        -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
        +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);
    
        @@
        expression parent, name, size, type, errp;
        expression child;
        symbol true;
        @@
        -    sysbus_init_child_obj(parent, name, child, size, type);
        +    sysbus_init_child_XXX(parent, name, child, size, type);
             ...
        -    object_property_set_bool(OBJECT(child), true, "realized", errp);
        +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    
        @@
        expression parent, name, size, type;
        expression child;
        expression dev;
        expression expr;
        @@
        -    sysbus_init_child_obj(parent, name, child, size, type);
        +    sysbus_init_child_XXX(parent, name, child, size, type);
             ...
             dev = DEVICE(child);
             ... when != dev = expr;
        -    qdev_init_nofail(dev);
        +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    
        @@
        expression parent, propname, type;
        expression child;
        @@
        -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
        +    object_initialize_child(parent, propname, child, type)
    
        @@
        expression parent, propname, type;
        expression child;
        @@
        -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
        +    object_initialize_child(parent, propname, &child, type)
    
    Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
    Acked-by: default avatarAlistair Francis <alistair.francis@wdc.com>
    Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Message-Id: <20200610053247.1583243-48-armbru@redhat.com>
    0074fce6
    sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
    Markus Armbruster authored
    
    
    I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
    recent commit "qdev: Convert uses of qdev_set_parent_bus() with
    Coccinelle" explains why.
    
    sysbus_init_child_obj() is a wrapper around
    object_initialize_child_with_props() and qdev_set_parent_bus().  It
    passes no properties.
    
    Convert sysbus_init_child_obj()/realize to object_initialize_child()/
    qdev_realize().
    
    Coccinelle script:
    
        @@
        expression parent, name, size, type, errp;
        expression child;
        symbol true;
        @@
        -    sysbus_init_child_obj(parent, name, &child, size, type);
        +    sysbus_init_child_XXX(parent, name, &child, size, type);
             ...
        -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
        +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);
    
        @@
        expression parent, name, size, type, errp;
        expression child;
        symbol true;
        @@
        -    sysbus_init_child_obj(parent, name, child, size, type);
        +    sysbus_init_child_XXX(parent, name, child, size, type);
             ...
        -    object_property_set_bool(OBJECT(child), true, "realized", errp);
        +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    
        @@
        expression parent, name, size, type;
        expression child;
        expression dev;
        expression expr;
        @@
        -    sysbus_init_child_obj(parent, name, child, size, type);
        +    sysbus_init_child_XXX(parent, name, child, size, type);
             ...
             dev = DEVICE(child);
             ... when != dev = expr;
        -    qdev_init_nofail(dev);
        +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    
        @@
        expression parent, propname, type;
        expression child;
        @@
        -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
        +    object_initialize_child(parent, propname, child, type)
    
        @@
        expression parent, propname, type;
        expression child;
        @@
        -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
        +    object_initialize_child(parent, propname, &child, type)
    
    Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
    Acked-by: default avatarAlistair Francis <alistair.francis@wdc.com>
    Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Message-Id: <20200610053247.1583243-48-armbru@redhat.com>
Loading