[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH] error: Remove NULL checks on error_propagate() ca
From: |
Markus Armbruster |
Subject: |
[Qemu-trivial] [PATCH] error: Remove NULL checks on error_propagate() calls |
Date: |
Thu, 13 Dec 2018 18:31:13 +0100 |
Patch created mechanically by rerunning:
$ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
--macro-file scripts/cocci-macro-file.h \
--dir . --in-place
Whitespace tidied up manually.
Signed-off-by: Markus Armbruster <address@hidden>
---
blockdev.c | 4 +---
hw/s390x/s390-pci-bus.c | 4 +---
qga/commands-posix.c | 7 ++-----
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 81f95d920b..5f2cbe352d 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -992,9 +992,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType
block_default_type,
blk = blockdev_init(filename, bs_opts, &local_err);
bs_opts = NULL;
if (!blk) {
- if (local_err) {
- error_propagate(errp, local_err);
- }
+ error_propagate(errp, local_err);
goto fail;
} else {
assert(!local_err);
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 060ff062bc..98c9d6206a 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -731,9 +731,7 @@ static void s390_pcihost_realize(DeviceState *dev, Error
**errp)
css_register_io_adapters(CSS_IO_ADAPTER_PCI, true, false,
S390_ADAPTER_SUPPRESSIBLE, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- }
+ error_propagate(errp, local_err);
}
static int s390_pci_msix_init(S390PCIBusDevice *pbdev)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 1877976522..2e719d9b6b 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -1573,10 +1573,7 @@ static bool systemd_supports_mode(SuspendMode mode,
Error **errp)
return true;
}
- if (local_err) {
- error_propagate(errp, local_err);
- }
-
+ error_propagate(errp, local_err);
return false;
}
@@ -1782,7 +1779,7 @@ static void guest_suspend(SuspendMode mode, Error **errp)
if (!mode_supported) {
error_setg(errp,
"the requested suspend mode is not supported by the guest");
- } else if (local_err) {
+ } else {
error_propagate(errp, local_err);
}
}
--
2.17.2
- [Qemu-trivial] [PATCH] error: Remove NULL checks on error_propagate() calls,
Markus Armbruster <=