g_return_if_fail(), g_return_val_if_fail() misuse

[PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure

Posted by Markus Armbruster 4 years, 9 months ago

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/display/vhost-user-gpu.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index 51f1747c4a..db042c7c5e 100644
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -332,7 +332,6 @@ vhost_user_gpu_chr_read(void *opaque)
     }
 
     msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size);
-    g_return_if_fail(msg != NULL);
 
     r = qemu_chr_fe_read_all(&g->vhost_chr,
                              (uint8_t *)&msg->payload, size);
-- 
2.26.2

Re: [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure

Posted by Marc-André Lureau 4 years, 9 months ago

On Tue, Jan 26, 2021 at 4:47 PM Markus Armbruster <armbru@redhat.com> wrote:
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>


Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

thanks

> ---
>  hw/display/vhost-user-gpu.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
> index 51f1747c4a..db042c7c5e 100644
> --- a/hw/display/vhost-user-gpu.c
> +++ b/hw/display/vhost-user-gpu.c
> @@ -332,7 +332,6 @@ vhost_user_gpu_chr_read(void *opaque)
>      }
>
>      msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size);
> -    g_return_if_fail(msg != NULL);
>
>      r = qemu_chr_fe_read_all(&g->vhost_chr,
>                               (uint8_t *)&msg->payload, size);
> --
> 2.26.2
>
>


-- 
Marc-André Lureau

Re: [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure

Posted by Michael S. Tsirkin 4 years, 9 months ago

On Tue, Jan 26, 2021 at 01:42:40PM +0100, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  hw/display/vhost-user-gpu.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
> index 51f1747c4a..db042c7c5e 100644
> --- a/hw/display/vhost-user-gpu.c
> +++ b/hw/display/vhost-user-gpu.c
> @@ -332,7 +332,6 @@ vhost_user_gpu_chr_read(void *opaque)
>      }
>  
>      msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size);
> -    g_return_if_fail(msg != NULL);
>  
>      r = qemu_chr_fe_read_all(&g->vhost_chr,
>                               (uint8_t *)&msg->payload, size);
> -- 
> 2.26.2

Re: [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure

Posted by Laurent Vivier 4 years, 8 months ago

Le 26/01/2021 à 13:42, Markus Armbruster a écrit :
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  hw/display/vhost-user-gpu.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
> index 51f1747c4a..db042c7c5e 100644
> --- a/hw/display/vhost-user-gpu.c
> +++ b/hw/display/vhost-user-gpu.c
> @@ -332,7 +332,6 @@ vhost_user_gpu_chr_read(void *opaque)
>      }
>  
>      msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size);
> -    g_return_if_fail(msg != NULL);
>  
>      r = qemu_chr_fe_read_all(&g->vhost_chr,
>                               (uint8_t *)&msg->payload, size);
> 

Applied to my trivial-patches branch.

Thanks,
Laurent