isa: Convert uses of isa_create() with Coccinelle
commit96927c744f9cd5205f95ef897c35695038dc2896
authorMarkus Armbruster <armbru@redhat.com>
Wed, 10 Jun 2020 05:32:08 +0000 (10 07:32 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Mon, 15 Jun 2020 20:05:28 +0000 (15 22:05 +0200)
tree5da3a4cb78c4ea9f2b9ae4c240d3f22d5cd24dae
parent0fe9d9011971820b2dab27aa49cfb957b91cc3e2
isa: Convert uses of isa_create() with Coccinelle

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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
13 files changed:
hw/char/parallel-isa.c
hw/char/serial-isa.c
hw/dma/i8257.c
hw/ide/isa.c
hw/intc/i8259_common.c
hw/isa/isa-bus.c
hw/isa/isa-superio.c
hw/ppc/prep.c
hw/rtc/m48t59-isa.c
hw/rtc/mc146818rtc.c
hw/sparc64/sun4u.c
include/hw/audio/pcspk.h
include/hw/timer/i8254.h