Skip to content
  • Markus Armbruster's avatar
    96927c74
    isa: Convert uses of isa_create() with Coccinelle · 96927c74
    Markus Armbruster authored
    
    
    Replace
    
        dev = isa_create(bus, type_name);
        ...
        qdev_init_nofail(dev);
    
    by
    
        dev = isa_new(type_name);
        ...
        isa_realize_and_unref(dev, bus, &error_fatal);
    
    Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
    why.
    
    Coccinelle script:
    
        @@
        expression dev, bus, expr;
        expression list args;
        expression d;
        @@
        -    dev = isa_create(bus, args);
        +    dev = isa_new(args);
        (
             d = &dev->qdev;
        |
             d = DEVICE(dev);
        )
             ... when != dev = expr
        -    qdev_init_nofail(d);
        +    isa_realize_and_unref(dev, bus, &error_fatal);
    
        @@
        expression dev, bus, expr;
        expression list args;
        @@
        -    dev = isa_create(bus, args);
        +    dev = isa_new(args);
             ... when != dev = expr
        -    qdev_init_nofail(DEVICE(dev));
        +    isa_realize_and_unref(dev, bus, &error_fatal);
    
        @@
        expression dev, bus, expr;
        expression list args;
        @@
        -    dev = DEVICE(isa_create(bus, args));
        +    ISADevice *isa_dev; // TODO move
        +    isa_dev = isa_new(args);
        +    dev = DEVICE(isa_dev);
             ... when != dev = expr
        -    qdev_init_nofail(dev);
        +    isa_realize_and_unref(isa_dev, bus, &error_fatal);
    
    Missing #include "qapi/error.h" added manually, whitespace changes
    minimized manually.
    
    Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
    Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
    96927c74
    isa: Convert uses of isa_create() with Coccinelle
    Markus Armbruster authored
    
    
    Replace
    
        dev = isa_create(bus, type_name);
        ...
        qdev_init_nofail(dev);
    
    by
    
        dev = isa_new(type_name);
        ...
        isa_realize_and_unref(dev, bus, &error_fatal);
    
    Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
    why.
    
    Coccinelle script:
    
        @@
        expression dev, bus, expr;
        expression list args;
        expression d;
        @@
        -    dev = isa_create(bus, args);
        +    dev = isa_new(args);
        (
             d = &dev->qdev;
        |
             d = DEVICE(dev);
        )
             ... when != dev = expr
        -    qdev_init_nofail(d);
        +    isa_realize_and_unref(dev, bus, &error_fatal);
    
        @@
        expression dev, bus, expr;
        expression list args;
        @@
        -    dev = isa_create(bus, args);
        +    dev = isa_new(args);
             ... when != dev = expr
        -    qdev_init_nofail(DEVICE(dev));
        +    isa_realize_and_unref(dev, bus, &error_fatal);
    
        @@
        expression dev, bus, expr;
        expression list args;
        @@
        -    dev = DEVICE(isa_create(bus, args));
        +    ISADevice *isa_dev; // TODO move
        +    isa_dev = isa_new(args);
        +    dev = DEVICE(isa_dev);
             ... when != dev = expr
        -    qdev_init_nofail(dev);
        +    isa_realize_and_unref(isa_dev, bus, &error_fatal);
    
    Missing #include "qapi/error.h" added manually, whitespace changes
    minimized manually.
    
    Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
    Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
Loading