| Message ID | 20250307180337.14811-4-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hw/vfio: Build various objects once | expand |
On 3/7/25 10:03, Philippe Mathieu-Daudé wrote: > Some files don't rely on any target-specific knowledge > and can be compiled once: > > - helpers.c > - container-base.c > - migration.c (removing unnecessary "exec/ram_addr.h") > - migration-multifd.c > - cpr.c > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/vfio/migration.c | 1 - > hw/vfio/meson.build | 13 ++++++++----- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c > index 416643ddd69..fbff46cfc35 100644 > --- a/hw/vfio/migration.c > +++ b/hw/vfio/migration.c > @@ -27,7 +27,6 @@ > #include "qapi/error.h" > #include "qapi/qapi-events-vfio.h" > #include "exec/ramlist.h" > -#include "exec/ram_addr.h" > #include "pci.h" > #include "trace.h" > #include "hw/hw.h" > diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build > index 260d65febd6..8e376cfcbf8 100644 > --- a/hw/vfio/meson.build > +++ b/hw/vfio/meson.build > @@ -1,12 +1,7 @@ > vfio_ss = ss.source_set() > vfio_ss.add(files( > - 'helpers.c', > 'common.c', > - 'container-base.c', > 'container.c', > - 'migration.c', > - 'migration-multifd.c', > - 'cpr.c', > )) > vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) > vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( > @@ -25,3 +20,11 @@ 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', if_true: files( > + 'helpers.c', > + 'container-base.c', > + 'migration.c', > + 'migration-multifd.c', > + 'cpr.c', > +)) Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
On 3/7/25 19:03, Philippe Mathieu-Daudé wrote: > Some files don't rely on any target-specific knowledge > and can be compiled once: > > - helpers.c > - container-base.c > - migration.c (removing unnecessary "exec/ram_addr.h") > - migration-multifd.c > - cpr.c > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/vfio/migration.c | 1 - > hw/vfio/meson.build | 13 ++++++++----- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c > index 416643ddd69..fbff46cfc35 100644 > --- a/hw/vfio/migration.c > +++ b/hw/vfio/migration.c > @@ -27,7 +27,6 @@ > #include "qapi/error.h" > #include "qapi/qapi-events-vfio.h" > #include "exec/ramlist.h" > -#include "exec/ram_addr.h" > #include "pci.h" > #include "trace.h" > #include "hw/hw.h" > diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build > index 260d65febd6..8e376cfcbf8 100644 > --- a/hw/vfio/meson.build > +++ b/hw/vfio/meson.build > @@ -1,12 +1,7 @@ > vfio_ss = ss.source_set() > vfio_ss.add(files( > - 'helpers.c', > 'common.c', > - 'container-base.c', > 'container.c', > - 'migration.c', > - 'migration-multifd.c', > - 'cpr.c', > )) > vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) > vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( > @@ -25,3 +20,11 @@ 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', if_true: files( > + 'helpers.c', > + 'container-base.c', > + 'migration.c', > + 'migration-multifd.c', > + 'cpr.c', > +))
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 416643ddd69..fbff46cfc35 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -27,7 +27,6 @@ #include "qapi/error.h" #include "qapi/qapi-events-vfio.h" #include "exec/ramlist.h" -#include "exec/ram_addr.h" #include "pci.h" #include "trace.h" #include "hw/hw.h" diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 260d65febd6..8e376cfcbf8 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -1,12 +1,7 @@ vfio_ss = ss.source_set() vfio_ss.add(files( - 'helpers.c', 'common.c', - 'container-base.c', 'container.c', - 'migration.c', - 'migration-multifd.c', - 'cpr.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( @@ -25,3 +20,11 @@ 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', if_true: files( + 'helpers.c', + 'container-base.c', + 'migration.c', + 'migration-multifd.c', + 'cpr.c', +))
Some files don't rely on any target-specific knowledge and can be compiled once: - helpers.c - container-base.c - migration.c (removing unnecessary "exec/ram_addr.h") - migration-multifd.c - cpr.c Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/vfio/migration.c | 1 - hw/vfio/meson.build | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-)