qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous. Takes care of just one pattern that needs conversion. More to come in this series. Coccinelle script: @ depends on !(file in "hw/arm/highbank.c")@ expression bus, type_name, dev, expr; @@ - dev = qdev_create(bus, type_name); + dev = qdev_new(type_name); ... when != dev = expr - qdev_init_nofail(dev); + qdev_realize_and_unref(dev, bus, &error_fatal); @@ expression bus, type_name, dev, expr; identifier DOWN; @@ - dev = DOWN(qdev_create(bus, type_name)); + dev = DOWN(qdev_new(type_name)); ... when != dev = expr - qdev_init_nofail(DEVICE(dev)); + qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal); @@ expression bus, type_name, expr; identifier dev; @@ - DeviceState *dev = qdev_create(bus, type_name); + DeviceState *dev = qdev_new(type_name); ... when != dev = expr - qdev_init_nofail(dev); + qdev_realize_and_unref(dev, bus, &error_fatal); @@ expression bus, type_name, dev, expr, errp; symbol true; @@ - dev = qdev_create(bus, type_name); + dev = qdev_new(type_name); ... when != dev = expr - object_property_set_bool(OBJECT(dev), true, "realized", errp); + qdev_realize_and_unref(dev, bus, errp); @@ expression bus, type_name, expr, errp; identifier dev; symbol true; @@ - DeviceState *dev = qdev_create(bus, type_name); + DeviceState *dev = qdev_new(type_name); ... when != dev = expr - object_property_set_bool(OBJECT(dev), true, "realized", errp); + qdev_realize_and_unref(dev, bus, errp); The first rule exempts hw/arm/highbank.c, because it matches along two control flow paths there, with different @type_name. Covered by the next commit's manual conversions. Missing #include "qapi/error.h" added manually. Signed-off-by:Markus Armbruster <armbru@redhat.com> Reviewed-by:
Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20200610053247.1583243-10-armbru@redhat.com> [Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
Showing
- hw/alpha/typhoon.c 2 additions, 2 deletionshw/alpha/typhoon.c
- hw/arm/aspeed.c 4 additions, 3 deletionshw/arm/aspeed.c
- hw/arm/cubieboard.c 2 additions, 2 deletionshw/arm/cubieboard.c
- hw/arm/exynos4210.c 21 additions, 20 deletionshw/arm/exynos4210.c
- hw/arm/exynos4_boards.c 2 additions, 2 deletionshw/arm/exynos4_boards.c
- hw/arm/imx25_pdk.c 2 additions, 3 deletionshw/arm/imx25_pdk.c
- hw/arm/integratorcp.c 2 additions, 2 deletionshw/arm/integratorcp.c
- hw/arm/mcimx6ul-evk.c 2 additions, 3 deletionshw/arm/mcimx6ul-evk.c
- hw/arm/mcimx7d-sabre.c 2 additions, 3 deletionshw/arm/mcimx7d-sabre.c
- hw/arm/mps2-tz.c 2 additions, 2 deletionshw/arm/mps2-tz.c
- hw/arm/msf2-som.c 2 additions, 2 deletionshw/arm/msf2-som.c
- hw/arm/musicpal.c 4 additions, 4 deletionshw/arm/musicpal.c
- hw/arm/netduino2.c 2 additions, 2 deletionshw/arm/netduino2.c
- hw/arm/netduinoplus2.c 2 additions, 2 deletionshw/arm/netduinoplus2.c
- hw/arm/nseries.c 4 additions, 4 deletionshw/arm/nseries.c
- hw/arm/omap1.c 8 additions, 8 deletionshw/arm/omap1.c
- hw/arm/omap2.c 8 additions, 8 deletionshw/arm/omap2.c
- hw/arm/orangepi.c 2 additions, 2 deletionshw/arm/orangepi.c
- hw/arm/pxa2xx.c 4 additions, 4 deletionshw/arm/pxa2xx.c
- hw/arm/pxa2xx_gpio.c 3 additions, 2 deletionshw/arm/pxa2xx_gpio.c
Loading
Please register or sign in to comment