Commit 96927c74 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
parent 0fe9d901

hw/char/parallel-isa.c

+3 −2
Original line number Diff line number Diff line
@@ -14,17 +14,18 @@ 
#include "hw/isa/isa.h"

#include "hw/qdev-properties.h"

#include "hw/char/parallel.h"

#include "qapi/error.h"



static void parallel_init(ISABus *bus, int index, Chardev *chr)

{

    DeviceState *dev;

    ISADevice *isadev;



    isadev = isa_create(bus, "isa-parallel");

    isadev = isa_new("isa-parallel");

    dev = DEVICE(isadev);

    qdev_prop_set_uint32(dev, "index", index);

    qdev_prop_set_chr(dev, "chardev", chr);

    qdev_init_nofail(dev);

    isa_realize_and_unref(isadev, bus, &error_fatal);

}



void parallel_hds_isa_init(ISABus *bus, int n)

hw/char/serial-isa.c

+2 −2
Original line number Diff line number Diff line
@@ -160,11 +160,11 @@ static void serial_isa_init(ISABus *bus, int index, Chardev *chr) 
    DeviceState *dev;

    ISADevice *isadev;



    isadev = isa_create(bus, TYPE_ISA_SERIAL);

    isadev = isa_new(TYPE_ISA_SERIAL);

    dev = DEVICE(isadev);

    qdev_prop_set_uint32(dev, "index", index);

    qdev_prop_set_chr(dev, "chardev", chr);

    qdev_init_nofail(dev);

    isa_realize_and_unref(isadev, bus, &error_fatal);

}



void serial_hds_isa_init(ISABus *bus, int from, int to)

hw/dma/i8257.c

+5 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "hw/qdev-properties.h"

#include "migration/vmstate.h"

#include "hw/dma/i8257.h"

#include "qapi/error.h"

#include "qemu/main-loop.h"

#include "qemu/module.h"

#include "qemu/log.h"
@@ -638,21 +639,21 @@ void i8257_dma_init(ISABus *bus, bool high_page_enable) 
    ISADevice *isa1, *isa2;

    DeviceState *d;



    isa1 = isa_create(bus, TYPE_I8257);

    isa1 = isa_new(TYPE_I8257);

    d = DEVICE(isa1);

    qdev_prop_set_int32(d, "base", 0x00);

    qdev_prop_set_int32(d, "page-base", 0x80);

    qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x480 : -1);

    qdev_prop_set_int32(d, "dshift", 0);

    qdev_init_nofail(d);

    isa_realize_and_unref(isa1, bus, &error_fatal);



    isa2 = isa_create(bus, TYPE_I8257);

    isa2 = isa_new(TYPE_I8257);

    d = DEVICE(isa2);

    qdev_prop_set_int32(d, "base", 0xc0);

    qdev_prop_set_int32(d, "page-base", 0x88);

    qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x488 : -1);

    qdev_prop_set_int32(d, "dshift", 1);

    qdev_init_nofail(d);

    isa_realize_and_unref(isa2, bus, &error_fatal);



    isa_bus_dma(bus, ISADMA(isa1), ISADMA(isa2));

}

hw/ide/isa.c

+3 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "hw/isa/isa.h"

#include "hw/qdev-properties.h"

#include "migration/vmstate.h"

#include "qapi/error.h"

#include "qemu/module.h"

#include "sysemu/dma.h"
@@ -86,12 +87,12 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, 
    ISADevice *isadev;

    ISAIDEState *s;



    isadev = isa_create(bus, TYPE_ISA_IDE);

    isadev = isa_new(TYPE_ISA_IDE);

    dev = DEVICE(isadev);

    qdev_prop_set_uint32(dev, "iobase",  iobase);

    qdev_prop_set_uint32(dev, "iobase2", iobase2);

    qdev_prop_set_uint32(dev, "irq",     isairq);

    qdev_init_nofail(dev);

    isa_realize_and_unref(isadev, bus, &error_fatal);



    s = ISA_IDE(dev);

    if (hd0) {

hw/intc/i8259_common.c

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "hw/qdev-properties.h"

#include "migration/vmstate.h"

#include "monitor/monitor.h"

#include "qapi/error.h"



static int irq_level[16];

static uint64_t irq_count[16];
@@ -94,13 +95,13 @@ ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master) 
    DeviceState *dev;

    ISADevice *isadev;



    isadev = isa_create(bus, name);

    isadev = isa_new(name);

    dev = DEVICE(isadev);

    qdev_prop_set_uint32(dev, "iobase", master ? 0x20 : 0xa0);

    qdev_prop_set_uint32(dev, "elcr_addr", master ? 0x4d0 : 0x4d1);

    qdev_prop_set_uint8(dev, "elcr_mask", master ? 0xf8 : 0xde);

    qdev_prop_set_bit(dev, "master", master);

    qdev_init_nofail(dev);

    isa_realize_and_unref(isadev, bus, &error_fatal);



    return isadev;

}