virtio-gpu: Correct virgl_renderer_resource_get_info() error check
PATCH v2 1/1 virtio-gpu: Correct virgl_renderer_resource_get_info() error check
virgl_renderer_resource_get_info() returns errno and not -1 on error. Correct the return-value check.
---
v2: - Fixed similar incorrect error-checking in vhost-user-gpu
- Added r-b from Marc
contrib/vhost-user-gpu/virgl.c | 6 +++--- hw/display/virtio-gpu-virgl.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
contrib/vhost-user-gpu/virgl.c +3 -3
@@ -327,7 +327,7 @@ virgl_get_resource_info_modifiers(uint32_t resource_id,#ifdef VIRGL_RENDERER_RESOURCE_INFO_EXT_VERSION struct virgl_renderer_resource_info_ext info_ext; ret =virgl_renderer_resource_get_info_ext (resource_id, &info_ext); -if (ret <0 ) { +if (ret) {return ret; }
@@ -335,7 +335,7 @@ virgl_get_resource_info_modifiers(uint32_t resource_id, *modifiers = info_ext.modifiers;#else ret =virgl_renderer_resource_get_info (resource_id, info); -if (ret <0 ) { +if (ret) {return ret; }
@@ -372,7 +372,7 @@ virgl_cmd_set_scanout(VuGpu *g,uint64_t modifiers =0 ; ret =virgl_get_resource_info_modifiers (ss.resource_id, &info, &modifiers); -if (ret ==-1 ) { +if (ret) {g_critical ("%s: illegal resource specified %d\n" , __func__, ss.resource_id); cmd->error =VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID ;
hw/display/virtio-gpu-virgl.c +1 -1
@@ -181,7 +181,7 @@ static void virgl_cmd_set_scanout(VirtIOGPU *g,memset (&info,0 ,sizeof (info)); ret =virgl_renderer_resource_get_info (ss.resource_id, &info);#endif -if (ret ==-1 ) { +if (ret) {qemu_log_mask (LOG_GUEST_ERROR ,"%s: illegal resource specified %d\n" , __func__, ss.resource_id);
Signature · 1 line
2.43.0
Hi Dmitry,
Quoted 1 line · Dmitry Osipenko
virgl_renderer_resource_get_info()returns errno and not -1 on error.
So basically we were ignoring all errors...
Could some errors just be safely ignored? Because apparently this patch now gives troubles, see:
https://gitlab.com/qemu-project/qemu/-/issues/2490
Can you help us there?
Regards,
Phil.
Quoted 57 lines
Correct the return-value check.
Reviewed-by Marc-André Lureau <[email protected]>Signed-off-by Dmitry Osipenko <[email protected]>---
v2: - Fixed similar incorrect error-checking in vhost-user-gpu
- Added r-b from Marccontrib/vhost-user-gpu/virgl.c | 6 +++--- hw/display/virtio-gpu-virgl.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)contrib/vhost-user-gpu/virgl.c +3
-3@@ -327,7 +327,7 @@ virgl_get_resource_info_modifiers(uint32_t resource_id,#ifdef VIRGL_RENDERER_RESOURCE_INFO_EXT_VERSION struct virgl_renderer_resource_info_ext info_ext; ret =virgl_renderer_resource_get_info_ext (resource_id, &info_ext); -if (ret <0 ) { +if (ret) {return ret; }@@ -335,7 +335,7 @@ virgl_get_resource_info_modifiers(uint32_t resource_id, *modifiers = info_ext.modifiers;#else ret =virgl_renderer_resource_get_info (resource_id, info); -if (ret <0 ) { +if (ret) {return ret; }@@ -372,7 +372,7 @@ virgl_cmd_set_scanout(VuGpu *g,uint64_t modifiers =0 ; ret =virgl_get_resource_info_modifiers (ss.resource_id, &info, &modifiers); -if (ret ==-1 ) { +if (ret) {g_critical ("%s: illegal resource specified %d\n" , __func__, ss.resource_id); cmd->error =VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID ;hw/display/virtio-gpu-virgl.c +1
-1@@ -181,7 +181,7 @@ static void virgl_cmd_set_scanout(VirtIOGPU *g,memset (&info,0 ,sizeof (info)); ret =virgl_renderer_resource_get_info (ss.resource_id, &info);#endif -if (ret ==-1 ) { +if (ret) {qemu_log_mask (LOG_GUEST_ERROR ,"%s: illegal resource specified %d\n" , __func__, ss.resource_id);
Quoted 11 lines · Philippe Mathieu-Daudé
Hi Dmitry,
Quoted 1 line · Dmitry Osipenko
virgl_renderer_resource_get_info()returns errno and not -1 on error.So basically we were ignoring all errors...
Could some errors just be safely ignored? Because apparently this patch now gives troubles, see:
https://gitlab.com/qemu-project/qemu/-/issues/2490
Can you help us there?
Hi, Philippe. Replied on the gitlab.
Signature · 2 lines
Best regards, Dmitry