diff mbox series

[2/8] error: Remove NULL checks on error_propagate() calls

Message ID 20180704153919.12432-3-f4bug@amsat.org
State New
Headers show
Series Coccinelle cleanups | expand

Commit Message

Philippe Mathieu-Daudé July 4, 2018, 3:39 p.m. UTC
Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
            --macro-file scripts/cocci-macro-file.h \
            --dir . --in-place

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/s390x/virtio-ccw.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Markus Armbruster July 5, 2018, 5:38 a.m. UTC | #1
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Patch created mechanically by rerunning:
>
>   $  spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/s390x/virtio-ccw.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index b92a85d0b0..7ddb378d52 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -1836,11 +1836,9 @@ static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)
>  {
>      VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);
>      DeviceState *vdev = DEVICE(&dev->vdev);
> -    Error *err = NULL;
>  
>      qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
> -    object_property_set_bool(OBJECT(vdev), true, "realized", &err);
> -    error_propagate(errp, err);
> +    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
>  }
>  
>  static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)

Reviewed-by: Markus Armbruster <armbru@redhat.com>
David Hildenbrand July 5, 2018, 8:49 a.m. UTC | #2
On 04.07.2018 17:39, Philippe Mathieu-Daudé 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
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/s390x/virtio-ccw.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index b92a85d0b0..7ddb378d52 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -1836,11 +1836,9 @@ static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)
>  {
>      VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);
>      DeviceState *vdev = DEVICE(&dev->vdev);
> -    Error *err = NULL;
>  
>      qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
> -    object_property_set_bool(OBJECT(vdev), true, "realized", &err);
> -    error_propagate(errp, err);
> +    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
>  }
>  
>  static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)
> 

Reviewed-by: David Hildenbrand <david@redhat.com>
diff mbox series

Patch

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index b92a85d0b0..7ddb378d52 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1836,11 +1836,9 @@  static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)
 {
     VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);
     DeviceState *vdev = DEVICE(&dev->vdev);
-    Error *err = NULL;
 
     qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
-    object_property_set_bool(OBJECT(vdev), true, "realized", &err);
-    error_propagate(errp, err);
+    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
 }
 
 static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)