| Message ID | 20250308230917.18907-14-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hw/vfio: Build various objects once | expand |
On 3/9/25 00:09, Philippe Mathieu-Daudé wrote: > The file doesn't use any target-specific knowledge anymore, > move it to system_ss[] to build it once. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/vfio/meson.build | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build > index 6ab711d0539..21c9cd6d2eb 100644 > --- a/hw/vfio/meson.build > +++ b/hw/vfio/meson.build > @@ -11,13 +11,14 @@ vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( > vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) > vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) > vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) > -vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) > > specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) > > system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) > system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) > -system_ss.add(when: 'CONFIG_VFIO_IGD', if_false: files( > +system_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files( > + 'igd.c', > +), if_false: files( > 'igd-stubs.c', > )) > system_ss.add(when: 'CONFIG_VFIO', if_true: files(
On 3/9/25 00:09, Philippe Mathieu-Daudé wrote: > The file doesn't use any target-specific knowledge anymore, > move it to system_ss[] to build it once. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> There are conflicts with series [1] modifying igd. I think it would be better to wait after it's merged, unless you have time to rebase on top of [1] Thanks, C. [1] https://lore.kernel.org/qemu-devel/20250306180131.32970-1-tomitamoeko@gmail.com/ > --- > hw/vfio/meson.build | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build > index 6ab711d0539..21c9cd6d2eb 100644 > --- a/hw/vfio/meson.build > +++ b/hw/vfio/meson.build > @@ -11,13 +11,14 @@ vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( > vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) > vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) > vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) > -vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) > > specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) > > system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) > system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) > -system_ss.add(when: 'CONFIG_VFIO_IGD', if_false: files( > +system_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files( > + 'igd.c', > +), if_false: files( > 'igd-stubs.c', > )) > system_ss.add(when: 'CONFIG_VFIO', if_true: files(
diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 6ab711d0539..21c9cd6d2eb 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -11,13 +11,14 @@ vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) -vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) -system_ss.add(when: 'CONFIG_VFIO_IGD', if_false: files( +system_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files( + 'igd.c', +), if_false: files( 'igd-stubs.c', )) system_ss.add(when: 'CONFIG_VFIO', if_true: files(
The file doesn't use any target-specific knowledge anymore, move it to system_ss[] to build it once. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/vfio/meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)