Re: [PATCH v2 1/5] hw/display/virtio-gpu-virgl: virtio_gpu_gl -> virtio_gpu_virgl

[Akihiko Odaki]

On 2023/04/29 1:48, Gurchetan Singh wrote:
> From: Gurchetan Singh <gurchetansingh@chromium.org>
>
> The virtio-gpu GL device has a heavy dependence on virgl.
> Acknowledge this by naming functions accurately.
>
> Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> v1:
>   - (Philippe) virtio_gpu_virglrenderer_reset --> 
> virtio_gpu_virgl_reset_renderer
> v2:
>   - (Akihiko) Fix unnecessary line break
>
>   hw/display/virtio-gpu-gl.c     | 26 +++++++++++++-------------
>   hw/display/virtio-gpu-virgl.c  |  2 +-
>   include/hw/virtio/virtio-gpu.h |  2 +-
>   3 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
> index e06be60dfb..8573043b85 100644
> --- a/hw/display/virtio-gpu-gl.c
> +++ b/hw/display/virtio-gpu-gl.c
> @@ -25,9 +25,9 @@
>   
>   #include <virglrenderer.h>
>   
> -static void virtio_gpu_gl_update_cursor_data(VirtIOGPU *g,
> -                                             struct virtio_gpu_scanout *s,
> -                                             uint32_t resource_id)
> +static void virtio_gpu_virgl_update_cursor(VirtIOGPU *g,
> +                               struct virtio_gpu_scanout *s,
> +                               uint32_t resource_id)

Now the last two parameters are misaligned.

>   {
>       uint32_t width, height;
>       uint32_t pixels, *data;
> @@ -48,14 +48,14 @@ static void virtio_gpu_gl_update_cursor_data(VirtIOGPU *g,
>       free(data);
>   }
>   
> -static void virtio_gpu_gl_flushed(VirtIOGPUBase *b)
> +static void virtio_gpu_virgl_flushed(VirtIOGPUBase *b)
>   {
>       VirtIOGPU *g = VIRTIO_GPU(b);
>   
>       virtio_gpu_process_cmdq(g);
>   }
>   
> -static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
> +static void virtio_gpu_virgl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
>   {
>       VirtIOGPU *g = VIRTIO_GPU(vdev);
>       VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev);
> @@ -71,7 +71,7 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, 
> VirtQueue *vq)
>       }
>       if (gl->renderer_reset) {
>           gl->renderer_reset = false;
> -        virtio_gpu_virgl_reset(g);
> +        virtio_gpu_virgl_reset_renderer(g);
>       }
>   
>       cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command));
> @@ -87,7 +87,7 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, 
> VirtQueue *vq)
>       virtio_gpu_virgl_fence_poll(g);
>   }
>   
> -static void virtio_gpu_gl_reset(VirtIODevice *vdev)
> +static void virtio_gpu_virgl_reset(VirtIODevice *vdev)
>   {
>       VirtIOGPU *g = VIRTIO_GPU(vdev);
>       VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev);
> @@ -104,7 +104,7 @@ static void virtio_gpu_gl_reset(VirtIODevice *vdev)
>       }
>   }
>   
> -static void virtio_gpu_gl_device_realize(DeviceState *qdev, Error **errp)
> +static void virtio_gpu_virgl_device_realize(DeviceState *qdev, Error **errp)
>   {
>       VirtIOGPU *g = VIRTIO_GPU(qdev);
>   
> @@ -143,13 +143,13 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data)
>       VirtIOGPUBaseClass *vbc = VIRTIO_GPU_BASE_CLASS(klass);
>       VirtIOGPUClass *vgc = VIRTIO_GPU_CLASS(klass);
>   
> -    vbc->gl_flushed = virtio_gpu_gl_flushed;
> -    vgc->handle_ctrl = virtio_gpu_gl_handle_ctrl;
> +    vbc->gl_flushed = virtio_gpu_virgl_flushed;
> +    vgc->handle_ctrl = virtio_gpu_virgl_handle_ctrl;
>       vgc->process_cmd = virtio_gpu_virgl_process_cmd;
> -    vgc->update_cursor_data = virtio_gpu_gl_update_cursor_data;
> +    vgc->update_cursor_data = virtio_gpu_virgl_update_cursor;
>   
> -    vdc->realize = virtio_gpu_gl_device_realize;
> -    vdc->reset = virtio_gpu_gl_reset;
> +    vdc->realize = virtio_gpu_virgl_device_realize;
> +    vdc->reset = virtio_gpu_virgl_reset;
>       device_class_set_props(dc, virtio_gpu_gl_properties);
>   }
>   
> diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
> index 1c47603d40..ffe4ec7f3d 100644
> --- a/hw/display/virtio-gpu-virgl.c
> +++ b/hw/display/virtio-gpu-virgl.c
> @@ -599,7 +599,7 @@ void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g)
>       }
>   }
>   
> -void virtio_gpu_virgl_reset(VirtIOGPU *g)
> +void virtio_gpu_virgl_reset_renderer(VirtIOGPU *g)
>   {
>       virgl_renderer_reset();
>   }
> diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
> index 2e28507efe..21b0f55bc8 100644
> --- a/include/hw/virtio/virtio-gpu.h
> +++ b/include/hw/virtio/virtio-gpu.h
> @@ -281,7 +281,7 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
>                                     struct virtio_gpu_ctrl_command *cmd);
>   void virtio_gpu_virgl_fence_poll(VirtIOGPU *g);
>   void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g);
> -void virtio_gpu_virgl_reset(VirtIOGPU *g);
> +void virtio_gpu_virgl_reset_renderer(VirtIOGPU *g);
>   int virtio_gpu_virgl_init(VirtIOGPU *g);
>   int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g);
>