* [PATCH] Add missing pixman dependecy
@ 2022-11-09 15:34 mrezanin
2022-11-09 16:14 ` Philippe Mathieu-Daudé
2022-11-11 11:24 ` Paolo Bonzini
0 siblings, 2 replies; 5+ messages in thread
From: mrezanin @ 2022-11-09 15:34 UTC (permalink / raw)
To: qemu-devel; +Cc: imammedo, Miroslav Rezanina
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Add missing pixman dependecy
2022-11-09 15:34 [PATCH] Add missing pixman dependecy mrezanin
@ 2022-11-09 16:14 ` Philippe Mathieu-Daudé
2022-11-11 6:42 ` Miroslav Rezanina
2022-11-11 11:24 ` Paolo Bonzini
1 sibling, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-11-09 16:14 UTC (permalink / raw)
To: mrezanin, qemu-devel; +Cc: imammedo
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add missing pixman dependecy
2022-11-09 16:14 ` Philippe Mathieu-Daudé
@ 2022-11-11 6:42 ` Miroslav Rezanina
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Rezanina @ 2022-11-11 6:42 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-devel, imammedo
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add missing pixman dependecy
2022-11-09 15:34 [PATCH] Add missing pixman dependecy mrezanin
2022-11-09 16:14 ` Philippe Mathieu-Daudé
@ 2022-11-11 11:24 ` Paolo Bonzini
2022-11-11 11:34 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2022-11-11 11:24 UTC (permalink / raw)
To: mrezanin, qemu-devel; +Cc: imammedo
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add missing pixman dependecy
2022-11-11 11:24 ` Paolo Bonzini
@ 2022-11-11 11:34 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-11-11 11:34 UTC (permalink / raw)
To: Paolo Bonzini, mrezanin, qemu-devel; +Cc: imammedo, Michael S. Tsirkin
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/
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-11 11:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-09 15:34 [PATCH] Add missing pixman dependecy mrezanin
2022-11-09 16:14 ` Philippe Mathieu-Daudé
2022-11-11 6:42 ` Miroslav Rezanina
2022-11-11 11:24 ` Paolo Bonzini
2022-11-11 11:34 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).