1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH] error: Remove NULL checks on error_propagate() calls

Markus Armbruster posted 1 patch 6 years, 10 months ago
Test asan passed
Test checkpatch passed
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
Test docker-clang@ubuntu passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20181213173113.11211-1-armbru@redhat.com
blockdev.c              | 4 +---
hw/s390x/s390-pci-bus.c | 4 +---
qga/commands-posix.c    | 7 ++-----
3 files changed, 4 insertions(+), 11 deletions(-)
[Qemu-devel] [PATCH] error: Remove NULL checks on error_propagate() calls
Posted by Markus Armbruster 6 years, 10 months ago 
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 <armbru@redhat.com>
---
 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
Re: [Qemu-devel] [PATCH] error: Remove NULL checks on error_propagate() calls
Posted by Eric Blake 6 years, 10 months ago 
On 12/13/18 11:31 AM, Markus Armbruster wrote:
> 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 <armbru@redhat.com>
> ---
>   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 <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org
Re: [Qemu-devel] [Qemu-trivial] [PATCH] error: Remove NULL checks on error_propagate() calls
Posted by Laurent Vivier 6 years, 10 months ago 
On 13/12/2018 18:31, Markus Armbruster wrote:
> 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 <armbru@redhat.com>
> ---
>  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 <laurent@vivier.eu>
Re: [Qemu-devel] [PATCH] error: Remove NULL checks on error_propagate() calls
Posted by Philippe Mathieu-Daudé 6 years, 10 months ago 
On 12/13/18 6:31 PM, Markus Armbruster wrote:
> 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 <armbru@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  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);
>      }
>  }
>
Re: [Qemu-devel] [Qemu-trivial] [PATCH] error: Remove NULL checks on error_propagate() calls
Posted by Laurent Vivier 6 years, 10 months ago 
On 13/12/2018 18:31, Markus Armbruster wrote:
> 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 <armbru@redhat.com>
> ---
>  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);
>      }
>  }
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.