jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

qdev: Use returned bool to check for failure, Coccinelle part

The previous commit enables conversion of

qdev_prop_set_drive_err(..., &err);
if (err) {
...
}

to

if (!qdev_prop_set_drive_err(..., errp)) {
...
}

Coccinelle script:

@@
identifier fun = qdev_prop_set_drive_err;
expression list args;
typedef Error;
Error *err;
@@
- fun(args, &err);
- if (err)
+ if (!fun(args, &err))
{
...
}

One line break tidied up manually.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-33-armbru@redhat.com>

Markus Armbruster 0c0e618d 73ac1aac

+4 -7
+1 -2
hw/scsi/scsi-bus.c
··· 277 277 if (serial && object_property_find(OBJECT(dev), "serial", NULL)) { 278 278 qdev_prop_set_string(dev, "serial", serial); 279 279 } 280 - qdev_prop_set_drive_err(dev, "drive", blk, &err); 281 - if (err) { 280 + if (!qdev_prop_set_drive_err(dev, "drive", blk, &err)) { 282 281 error_propagate(errp, err); 283 282 object_unparent(OBJECT(dev)); 284 283 return NULL;
+1 -2
hw/sd/sd.c
··· 706 706 707 707 obj = object_new(TYPE_SD_CARD); 708 708 dev = DEVICE(obj); 709 - qdev_prop_set_drive_err(dev, "drive", blk, &err); 710 - if (err) { 709 + if (!qdev_prop_set_drive_err(dev, "drive", blk, &err)) { 711 710 error_reportf_err(err, "sd_init failed: "); 712 711 return NULL; 713 712 }
+2 -3
hw/sd/ssi-sd.c
··· 254 254 dinfo = drive_get_next(IF_SD); 255 255 carddev = qdev_new(TYPE_SD_CARD); 256 256 if (dinfo) { 257 - qdev_prop_set_drive_err(carddev, "drive", blk_by_legacy_dinfo(dinfo), 258 - &err); 259 - if (err) { 257 + if (!qdev_prop_set_drive_err(carddev, "drive", 258 + blk_by_legacy_dinfo(dinfo), &err)) { 260 259 goto fail; 261 260 } 262 261 }