error: Remove NULL checks on error_propagate() calls
PATCH 1/1 error: Remove NULL checks on error_propagate() calls
Patch created mechanically by rerunning:
$ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
--macro-file scripts/cocci-macro-file.h \
--dir . --in-placeWhitespace tidied up manually.
Signed-off-by Markus Armbruster <[email protected]>
--- blockdev.c | 4 +--- hw/s390x/s390-pci-bus.c | 4 +--- qga/commands-posix.c | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-)
blockdev.c +1 -3
@@ -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);
hw/s390x/s390-pci-bus.c +1 -3
@@ -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)
qga/commands-posix.c +2 -5
@@ -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); } }
Signature · 1 line
2.17.2
Quoted 6 lines · Markus Armbruster
Patch created mechanically by rerunning:
$ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --dir . --in-place
Quoted 9 lines
Whitespace tidied up manually.
Signed-off-by Markus Armbruster <[email protected]>--- blockdev.c | 4 +--- hw/s390x/s390-pci-bus.c | 4 +--- qga/commands-posix.c | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-)
Reviewed-by Eric Blake <[email protected]>
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Quoted 6 lines · Markus Armbruster
Patch created mechanically by rerunning:
$ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --dir . --in-place
Quoted 8 lines
Whitespace tidied up manually.
Signed-off-by Markus Armbruster <[email protected]>--- blockdev.c | 4 +--- hw/s390x/s390-pci-bus.c | 4 +--- qga/commands-posix.c | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-)
Reviewed-by Laurent Vivier <[email protected]>
Quoted 9 lines · Markus Armbruster
Patch created mechanically by rerunning:
$ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --dir . --in-placeWhitespace tidied up manually.
Signed-off-by Markus Armbruster <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 62 lines
--- blockdev.c | 4 +--- hw/s390x/s390-pci-bus.c | 4 +--- qga/commands-posix.c | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-)blockdev.c +1
-3@@ -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);hw/s390x/s390-pci-bus.c +1
-3@@ -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)qga/commands-posix.c +2
-5@@ -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); } }
Laurent Vivier
AppliedQuoted 63 lines · Markus Armbruster
Patch created mechanically by rerunning:
$ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --dir . --in-placeWhitespace tidied up manually.
Signed-off-by Markus Armbruster <[email protected]>--- blockdev.c | 4 +--- hw/s390x/s390-pci-bus.c | 4 +--- qga/commands-posix.c | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-)blockdev.c +1
-3@@ -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);hw/s390x/s390-pci-bus.c +1
-3@@ -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)qga/commands-posix.c +1
-4@@ -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; }
qga/commands-posix.c static void guest_suspend(SuspendMode mode, Error **errp) · line 1785
Quoted 8 lines
qga/commands-posix.c +1
-1@@ -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); } }
Applied to my trivial-patches branch.
Thanks,
Laurent