virtio-gpu-virgl: guard new_blob with VIRGL_VERSION_MAJORS>=1

[PATCH] virtio-gpu-virgl: guard new_blob with VIRGL_VERSION_MAJORS>=1

Posted by marcandre.lureau@redhat.com 2 weeks, 1 day ago

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

virtio_gpu_virgl_resource_new_blob() is only called from
virgl_cmd_resource_create_blob(), which is guarded by
VIRGL_VERSION_MAJOR >= 1.

Fixes: d814b44636d0 ("hw/display/virtio-gpu: introduce virtio_gpu_{simple,virgl}_resource_new()")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/display/virtio-gpu-virgl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
index 1c9380e2a6d2..f45571060fea 100644
--- a/hw/display/virtio-gpu-virgl.c
+++ b/hw/display/virtio-gpu-virgl.c
@@ -324,6 +324,7 @@ virtio_gpu_virgl_resource_new(uint32_t resource_id, uint32_t width,
     return res;
 }
 
+#if VIRGL_VERSION_MAJOR >= 1
 static struct virtio_gpu_virgl_resource *
 virtio_gpu_virgl_resource_new_blob(uint32_t resource_id, uint64_t blob_size)
 {
@@ -335,6 +336,7 @@ virtio_gpu_virgl_resource_new_blob(uint32_t resource_id, uint64_t blob_size)
 
     return res;
 }
+#endif
 
 static void virgl_cmd_create_resource_2d(VirtIOGPU *g,
                                          struct virtio_gpu_ctrl_command *cmd)
-- 
2.55.0.543.g5ebe2ebe4ea8

Re: [PATCH] virtio-gpu-virgl: guard new_blob with VIRGL_VERSION_MAJORS>=1

Posted by Michael Tokarev 2 weeks, 1 day ago

On 9/11/26 17:06, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> virtio_gpu_virgl_resource_new_blob() is only called from
> virgl_cmd_resource_create_blob(), which is guarded by
> VIRGL_VERSION_MAJOR >= 1.
> 
> Fixes: d814b44636d0 ("hw/display/virtio-gpu: introduce virtio_gpu_{simple,virgl}_resource_new()")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   hw/display/virtio-gpu-virgl.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
> index 1c9380e2a6d2..f45571060fea 100644
> --- a/hw/display/virtio-gpu-virgl.c
> +++ b/hw/display/virtio-gpu-virgl.c
> @@ -324,6 +324,7 @@ virtio_gpu_virgl_resource_new(uint32_t resource_id, uint32_t width,
>       return res;
>   }
>   
> +#if VIRGL_VERSION_MAJOR >= 1
>   static struct virtio_gpu_virgl_resource *
>   virtio_gpu_virgl_resource_new_blob(uint32_t resource_id, uint64_t blob_size)
>   {
> @@ -335,6 +336,7 @@ virtio_gpu_virgl_resource_new_blob(uint32_t resource_id, uint64_t blob_size)
>   
>       return res;
>   }
> +#endif
>   
>   static void virgl_cmd_create_resource_2d(VirtIOGPU *g,
>                                            struct virtio_gpu_ctrl_command *cmd)

Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>

What's the reason to move it into a separate function, when
there's just one user of this code?

Thanks,

/mjt

Re: [PATCH] virtio-gpu-virgl: guard new_blob with VIRGL_VERSION_MAJORS>=1

Posted by Marc-André Lureau 2 weeks, 1 day ago

Hi

On Fri, Sep 11, 2026 at 6:43 PM Michael Tokarev <mjt@tls.msk.ru> wrote:
>
> On 9/11/26 17:06, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > virtio_gpu_virgl_resource_new_blob() is only called from
> > virgl_cmd_resource_create_blob(), which is guarded by
> > VIRGL_VERSION_MAJOR >= 1.
> >
> > Fixes: d814b44636d0 ("hw/display/virtio-gpu: introduce virtio_gpu_{simple,virgl}_resource_new()")
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> >   hw/display/virtio-gpu-virgl.c | 2 ++
> >   1 file changed, 2 insertions(+)
> >
> > diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
> > index 1c9380e2a6d2..f45571060fea 100644
> > --- a/hw/display/virtio-gpu-virgl.c
> > +++ b/hw/display/virtio-gpu-virgl.c
> > @@ -324,6 +324,7 @@ virtio_gpu_virgl_resource_new(uint32_t resource_id, uint32_t width,
> >       return res;
> >   }
> >
> > +#if VIRGL_VERSION_MAJOR >= 1
> >   static struct virtio_gpu_virgl_resource *
> >   virtio_gpu_virgl_resource_new_blob(uint32_t resource_id, uint64_t blob_size)
> >   {
> > @@ -335,6 +336,7 @@ virtio_gpu_virgl_resource_new_blob(uint32_t resource_id, uint64_t blob_size)
> >
> >       return res;
> >   }
> > +#endif
> >
> >   static void virgl_cmd_create_resource_2d(VirtIOGPU *g,
> >                                            struct virtio_gpu_ctrl_command *cmd)
>
> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
>
> What's the reason to move it into a separate function, when
> there's just one user of this code?
>

For consistency and readability, but indeed it could be folded.

Re: [PATCH] virtio-gpu-virgl: guard new_blob with VIRGL_VERSION_MAJORS>=1

Posted by Brian Cain 2 weeks, 1 day ago

On Fri, Sep 11, 2026 at 9:07 AM <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> virtio_gpu_virgl_resource_new_blob() is only called from
> virgl_cmd_resource_create_blob(), which is guarded by
> VIRGL_VERSION_MAJOR >= 1.
>
> Fixes: d814b44636d0 ("hw/display/virtio-gpu: introduce virtio_gpu_{simple,virgl}_resource_new()")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---

Reviewed-by: Brian Cain <brian.cain@oss.qualcomm.com>

>  hw/display/virtio-gpu-virgl.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
> index 1c9380e2a6d2..f45571060fea 100644
> --- a/hw/display/virtio-gpu-virgl.c
> +++ b/hw/display/virtio-gpu-virgl.c
> @@ -324,6 +324,7 @@ virtio_gpu_virgl_resource_new(uint32_t resource_id, uint32_t width,
>      return res;
>  }
>
> +#if VIRGL_VERSION_MAJOR >= 1
>  static struct virtio_gpu_virgl_resource *
>  virtio_gpu_virgl_resource_new_blob(uint32_t resource_id, uint64_t blob_size)
>  {
> @@ -335,6 +336,7 @@ virtio_gpu_virgl_resource_new_blob(uint32_t resource_id, uint64_t blob_size)
>
>      return res;
>  }
> +#endif
>
>  static void virgl_cmd_create_resource_2d(VirtIOGPU *g,
>                                           struct virtio_gpu_ctrl_command *cmd)
> --
> 2.55.0.543.g5ebe2ebe4ea8
>
>