mirror of https://github.com/xemu-project/xemu.git
3e80f6902c
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]
|
||
|---|---|---|
| .. | ||
| 3270-ccw.c | ||
| Kconfig | ||
| Makefile.objs | ||
| ap-bridge.c | ||
| ap-device.c | ||
| ccw-device.c | ||
| ccw-device.h | ||
| css-bridge.c | ||
| css.c | ||
| event-facility.c | ||
| ipl.c | ||
| ipl.h | ||
| pv.c | ||
| s390-ccw.c | ||
| s390-pci-bus.c | ||
| s390-pci-bus.h | ||
| s390-pci-inst.c | ||
| s390-pci-inst.h | ||
| s390-skeys-kvm.c | ||
| s390-skeys.c | ||
| s390-stattrib-kvm.c | ||
| s390-stattrib.c | ||
| s390-virtio-ccw.c | ||
| s390-virtio-hcall.c | ||
| s390-virtio-hcall.h | ||
| sclp.c | ||
| sclpcpu.c | ||
| sclpquiesce.c | ||
| tod-kvm.c | ||
| tod-qemu.c | ||
| tod.c | ||
| trace-events | ||
| vhost-vsock-ccw.c | ||
| virtio-ccw-9p.c | ||
| virtio-ccw-balloon.c | ||
| virtio-ccw-blk.c | ||
| virtio-ccw-crypto.c | ||
| virtio-ccw-gpu.c | ||
| virtio-ccw-input.c | ||
| virtio-ccw-net.c | ||
| virtio-ccw-rng.c | ||
| virtio-ccw-scsi.c | ||
| virtio-ccw-serial.c | ||
| virtio-ccw.c | ||
| virtio-ccw.h | ||