Add missing pixman dependecy

[PATCH] Add missing pixman dependecy

Posted by mrezanin@redhat.com 1 year, 5 months ago

From: Miroslav Rezanina <mrezanin@redhat.com>

Commit cfead31326 'acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors' added
a new file - acpi-vga.c. This file (indirectly) includes pixman.h file so we need to ensure pixman
is available when file is compiled.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
 hw/display/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/display/meson.build b/hw/display/meson.build
index 7a725ed80e..c8e84e9707 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -43,7 +43,7 @@ if (config_all_devices.has_key('CONFIG_VGA_CIRRUS') or
     config_all_devices.has_key('CONFIG_VMWARE_VGA') or
     config_all_devices.has_key('CONFIG_ATI_VGA')
    )
-  softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+  softmmu_ss.add(when: 'CONFIG_ACPI', if_true: [files('acpi-vga.c'), pixman],
                                       if_false: files('acpi-vga-stub.c'))
 endif
 
@@ -51,7 +51,7 @@ if config_all_devices.has_key('CONFIG_QXL')
   qxl_ss = ss.source_set()
   qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c', 'qxl-render.c'),
                                            pixman, spice])
-  qxl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+  qxl_ss.add(when: 'CONFIG_ACPI', if_true: [files('acpi-vga.c'), pixman],
                                   if_false: files('acpi-vga-stub.c'))
   hw_display_modules += {'qxl': qxl_ss}
 endif
@@ -99,14 +99,14 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
                     if_true: [files('virtio-vga.c'), pixman])
   virtio_vga_ss.add(when: 'CONFIG_VHOST_USER_VGA',
                     if_true: files('vhost-user-vga.c'))
-  virtio_vga_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+  virtio_vga_ss.add(when: 'CONFIG_ACPI', if_true: [files('acpi-vga.c'), pixman],
                                          if_false: files('acpi-vga-stub.c'))
   hw_display_modules += {'virtio-vga': virtio_vga_ss}
 
   virtio_vga_gl_ss = ss.source_set()
   virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl],
                        if_true: [files('virtio-vga-gl.c'), pixman])
-  virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+  virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: [files('acpi-vga.c'), pixman],
                                             if_false: files('acpi-vga-stub.c'))
   hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss}
 endif
-- 
2.31.1

Re: [PATCH] Add missing pixman dependecy

Posted by Paolo Bonzini 1 year, 5 months ago

On 11/9/22 16:34, mrezanin@redhat.com wrote:
> From: Miroslav Rezanina <mrezanin@redhat.com>
> 
> Commit cfead31326 'acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors' added
> a new file - acpi-vga.c. This file (indirectly) includes pixman.h file so we need to ensure pixman
> is available when file is compiled.
> 
> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

The patch is fine, but I think the new file does not need vga_int.h and 
therefore does not need to include pixman.h.  Can you try?

Paolo

> ---
>   hw/display/meson.build | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/display/meson.build b/hw/display/meson.build
> index 7a725ed80e..c8e84e9707 100644
> --- a/hw/display/meson.build
> +++ b/hw/display/meson.build
> @@ -43,7 +43,7 @@ if (config_all_devices.has_key('CONFIG_VGA_CIRRUS') or
>       config_all_devices.has_key('CONFIG_VMWARE_VGA') or
>       config_all_devices.has_key('CONFIG_ATI_VGA')
>      )
> -  softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
> +  softmmu_ss.add(when: 'CONFIG_ACPI', if_true: [files('acpi-vga.c'), pixman],
>                                         if_false: files('acpi-vga-stub.c'))
>   endif
>   
> @@ -51,7 +51,7 @@ if config_all_devices.has_key('CONFIG_QXL')
>     qxl_ss = ss.source_set()
>     qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c', 'qxl-render.c'),
>                                              pixman, spice])
> -  qxl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
> +  qxl_ss.add(when: 'CONFIG_ACPI', if_true: [files('acpi-vga.c'), pixman],
>                                     if_false: files('acpi-vga-stub.c'))
>     hw_display_modules += {'qxl': qxl_ss}
>   endif
> @@ -99,14 +99,14 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
>                       if_true: [files('virtio-vga.c'), pixman])
>     virtio_vga_ss.add(when: 'CONFIG_VHOST_USER_VGA',
>                       if_true: files('vhost-user-vga.c'))
> -  virtio_vga_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
> +  virtio_vga_ss.add(when: 'CONFIG_ACPI', if_true: [files('acpi-vga.c'), pixman],
>                                            if_false: files('acpi-vga-stub.c'))
>     hw_display_modules += {'virtio-vga': virtio_vga_ss}
>   
>     virtio_vga_gl_ss = ss.source_set()
>     virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl],
>                          if_true: [files('virtio-vga-gl.c'), pixman])
> -  virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
> +  virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: [files('acpi-vga.c'), pixman],
>                                               if_false: files('acpi-vga-stub.c'))
>     hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss}
>   endif

Re: [PATCH] Add missing pixman dependecy

Posted by Philippe Mathieu-Daudé 1 year, 5 months ago

On 11/11/22 12:24, Paolo Bonzini wrote:
> On 11/9/22 16:34, mrezanin@redhat.com wrote:
>> From: Miroslav Rezanina <mrezanin@redhat.com>
>>
>> Commit cfead31326 'acpi: pc: vga: use AcpiDevAmlIf interface to build 
>> VGA device descriptors' added
>> a new file - acpi-vga.c. This file (indirectly) includes pixman.h file 
>> so we need to ensure pixman
>> is available when file is compiled.
>>
>> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
> 
> The patch is fine, but I think the new file does not need vga_int.h and 
> therefore does not need to include pixman.h.  Can you try?

MST already fixed, see:
https://lore.kernel.org/qemu-devel/20221109222112.74519-1-mst@redhat.com/

Re: [PATCH] Add missing pixman dependecy

Posted by Philippe Mathieu-Daudé 1 year, 5 months ago

Hi Mirek,

On 9/11/22 16:34, mrezanin@redhat.com wrote:
> From: Miroslav Rezanina <mrezanin@redhat.com>
> 
> Commit cfead31326 'acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors' added
> a new file - acpi-vga.c. This file (indirectly) includes pixman.h file so we need to ensure pixman
> is available when file is compiled.

We don't need this dependency if we move the build_vga_aml() declaration
out of hw/display/vga_int.h, i.e. hw/display/acpi-vga.h.

Regards,

Phil.

Re: [PATCH] Add missing pixman dependecy

Posted by Miroslav Rezanina 1 year, 5 months ago

On Wed, Nov 9, 2022 at 5:14 PM Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> Hi Mirek,
>
> On 9/11/22 16:34, mrezanin@redhat.com wrote:
> > From: Miroslav Rezanina <mrezanin@redhat.com>
> >
> > Commit cfead31326 'acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors' added
> > a new file - acpi-vga.c. This file (indirectly) includes pixman.h file so we need to ensure pixman
> > is available when file is compiled.
>
> We don't need this dependency if we move the build_vga_aml() declaration
> out of hw/display/vga_int.h, i.e. hw/display/acpi-vga.h.
>

I'm not confident enough to change header files, especially during RC
phase. I followed the pattern used in the hw/display/meson.build as we
need this to be fixed before GA.

Mirek

> Regards,
>
> Phil.
>


-- 
Miroslav Řezanina
Virtualization Team - Maintainer