[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/53] qdev: Use returned bool to check for failure, Coccinelle pa
From: |
Markus Armbruster |
Subject: |
[PULL 32/53] qdev: Use returned bool to check for failure, Coccinelle part |
Date: |
Tue, 7 Jul 2020 23:24:42 +0200 |
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>
---
hw/scsi/scsi-bus.c | 3 +--
hw/sd/sd.c | 3 +--
hw/sd/ssi-sd.c | 5 ++---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index a83939f7d0..38b66a2f45 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -277,8 +277,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus,
BlockBackend *blk,
if (serial && object_property_find(OBJECT(dev), "serial", NULL)) {
qdev_prop_set_string(dev, "serial", serial);
}
- qdev_prop_set_drive_err(dev, "drive", blk, &err);
- if (err) {
+ if (!qdev_prop_set_drive_err(dev, "drive", blk, &err)) {
error_propagate(errp, err);
object_unparent(OBJECT(dev));
return NULL;
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 97a9d32964..5137168d66 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -706,8 +706,7 @@ SDState *sd_init(BlockBackend *blk, bool is_spi)
obj = object_new(TYPE_SD_CARD);
dev = DEVICE(obj);
- qdev_prop_set_drive_err(dev, "drive", blk, &err);
- if (err) {
+ if (!qdev_prop_set_drive_err(dev, "drive", blk, &err)) {
error_reportf_err(err, "sd_init failed: ");
return NULL;
}
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index ad825220e2..3717b2e721 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -254,9 +254,8 @@ static void ssi_sd_realize(SSISlave *d, Error **errp)
dinfo = drive_get_next(IF_SD);
carddev = qdev_new(TYPE_SD_CARD);
if (dinfo) {
- qdev_prop_set_drive_err(carddev, "drive", blk_by_legacy_dinfo(dinfo),
- &err);
- if (err) {
+ if (!qdev_prop_set_drive_err(carddev, "drive",
+ blk_by_legacy_dinfo(dinfo), &err)) {
goto fail;
}
}
--
2.26.2
- [PULL 00/53] Error reporting patches patches for 2020-07-07, Markus Armbruster, 2020/07/08
- [PULL 50/53] fw_cfg: Use ERRP_GUARD(), Markus Armbruster, 2020/07/08
- [PULL 02/53] error: Improve error.h's big comment, Markus Armbruster, 2020/07/08
- [PULL 38/53] block/parallels: Simplify parallels_open() after previous commit, Markus Armbruster, 2020/07/08
- [PULL 08/53] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/07/08
- [PULL 04/53] qdev: Use returned bool to check for qdev_realize() etc. failure, Markus Armbruster, 2020/07/08
- [PULL 07/53] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/08
- [PULL 32/53] qdev: Use returned bool to check for failure, Coccinelle part,
Markus Armbruster <=
- [PULL 06/53] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/08
- [PULL 44/53] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/08
- [PULL 52/53] nbd: Use ERRP_GUARD(), Markus Armbruster, 2020/07/08
- [PULL 27/53] qom: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/08
- [PULL 09/53] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/07/08
- [PULL 25/53] qom: Use return values to check for error where that's simpler, Markus Armbruster, 2020/07/08
- [PULL 35/53] error: Eliminate error_propagate() with Coccinelle, part 2, Markus Armbruster, 2020/07/08
- [PULL 19/53] qapi: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/08
- [PULL 05/53] macio: Tidy up error handling in macio_newworld_realize(), Markus Armbruster, 2020/07/08
- [PULL 28/53] qom: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/08