mirror of https://gitee.com/openkylin/qemu.git
db873cc5d1
This is the same transformation as in the previous commit, except
sysbus_init_child_obj() and realize are too separated for the commit's
Coccinelle script to handle, typically because sysbus_init_child_obj()
is in a device's instance_init() method, and the matching realize is
in its realize() method.
Perhaps a Coccinelle wizard could make it transform that pattern, but
I'm just a bungler, and the best I can do is transforming the two
separate parts separately:
@@
expression errp;
expression child;
symbol true;
@@
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression errp;
expression child;
symbol true;
@@
- object_property_set_bool(child, true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression child;
@@
- qdev_init_nofail(DEVICE(child));
+ sysbus_realize(SYS_BUS_DEVICE(child), &error_fatal);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression child;
expression dev;
@@
dev = DEVICE(child);
...
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression child;
identifier dev;
@@
DeviceState *dev = DEVICE(child);
...
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression parent, name, size, type;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
@@
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)
This script is *unsound*: we need to manually verify init and realize
conversions are properly paired.
This commit has only the pairs where object_initialize_child()'s
@child and sysbus_realize()'s @dev argument text match exactly within
the same source file.
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-49-armbru@redhat.com>
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile.objs | ||
| allwinner-a10.c | ||
| allwinner-h3.c | ||
| armsse.c | ||
| armv7m.c | ||
| aspeed.c | ||
| aspeed_ast2600.c | ||
| aspeed_soc.c | ||
| bcm2835_peripherals.c | ||
| bcm2836.c | ||
| boot.c | ||
| collie.c | ||
| cubieboard.c | ||
| digic.c | ||
| digic_boards.c | ||
| exynos4_boards.c | ||
| exynos4210.c | ||
| fsl-imx6.c | ||
| fsl-imx6ul.c | ||
| fsl-imx7.c | ||
| fsl-imx25.c | ||
| fsl-imx31.c | ||
| gumstix.c | ||
| highbank.c | ||
| imx25_pdk.c | ||
| integratorcp.c | ||
| kzm.c | ||
| mainstone.c | ||
| mcimx6ul-evk.c | ||
| mcimx7d-sabre.c | ||
| microbit.c | ||
| mps2-tz.c | ||
| mps2.c | ||
| msf2-soc.c | ||
| msf2-som.c | ||
| musca.c | ||
| musicpal.c | ||
| netduino2.c | ||
| netduinoplus2.c | ||
| nrf51_soc.c | ||
| nseries.c | ||
| omap1.c | ||
| omap2.c | ||
| omap_sx1.c | ||
| orangepi.c | ||
| palm.c | ||
| pxa2xx.c | ||
| pxa2xx_gpio.c | ||
| pxa2xx_pic.c | ||
| raspi.c | ||
| realview.c | ||
| sabrelite.c | ||
| sbsa-ref.c | ||
| smmu-common.c | ||
| smmu-internal.h | ||
| smmuv3-internal.h | ||
| smmuv3.c | ||
| spitz.c | ||
| stellaris.c | ||
| stm32f205_soc.c | ||
| stm32f405_soc.c | ||
| strongarm.c | ||
| strongarm.h | ||
| sysbus-fdt.c | ||
| tosa.c | ||
| trace-events | ||
| versatilepb.c | ||
| vexpress.c | ||
| virt-acpi-build.c | ||
| virt.c | ||
| xilinx_zynq.c | ||
| xlnx-versal-virt.c | ||
| xlnx-versal.c | ||
| xlnx-zcu102.c | ||
| xlnx-zynqmp.c | ||
| z2.c | ||