| Message ID | 20250307180337.14811-6-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: > Removing unused "exec/ram_addr.h" header allow to compile > iommufd.c once for all targets. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/vfio/iommufd.c | 1 - > hw/vfio/meson.build | 6 +++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c > index df61edffc08..42c8412bbf5 100644 > --- a/hw/vfio/iommufd.c > +++ b/hw/vfio/iommufd.c > @@ -25,7 +25,6 @@ > #include "qemu/cutils.h" > #include "qemu/chardev_open.h" > #include "pci.h" > -#include "exec/ram_addr.h" > > static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova, > ram_addr_t size, void *vaddr, bool readonly) > diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build > index 2972c6ff8de..fea6dbe88cd 100644 > --- a/hw/vfio/meson.build > +++ b/hw/vfio/meson.build > @@ -4,9 +4,6 @@ vfio_ss.add(files( > 'container.c', > )) > vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) > -vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( > - 'iommufd.c', > -)) > vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( > 'display.c', > 'pci-quirks.c', > @@ -28,3 +25,6 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( > 'migration-multifd.c', > 'cpr.c', > )) > +system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( > + 'iommufd.c', > +)) Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
On 3/7/25 19:03, Philippe Mathieu-Daudé wrote: > Removing unused "exec/ram_addr.h" header allow to compile > iommufd.c once for all targets. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/vfio/iommufd.c | 1 - > hw/vfio/meson.build | 6 +++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c > index df61edffc08..42c8412bbf5 100644 > --- a/hw/vfio/iommufd.c > +++ b/hw/vfio/iommufd.c > @@ -25,7 +25,6 @@ > #include "qemu/cutils.h" > #include "qemu/chardev_open.h" > #include "pci.h" > -#include "exec/ram_addr.h" > > static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova, > ram_addr_t size, void *vaddr, bool readonly) > diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build > index 2972c6ff8de..fea6dbe88cd 100644 > --- a/hw/vfio/meson.build > +++ b/hw/vfio/meson.build > @@ -4,9 +4,6 @@ vfio_ss.add(files( > 'container.c', > )) > vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) > -vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( > - 'iommufd.c', > -)) > vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( > 'display.c', > 'pci-quirks.c', > @@ -28,3 +25,6 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( > 'migration-multifd.c', > 'cpr.c', > )) > +system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( > + 'iommufd.c', > +))
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index df61edffc08..42c8412bbf5 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -25,7 +25,6 @@ #include "qemu/cutils.h" #include "qemu/chardev_open.h" #include "pci.h" -#include "exec/ram_addr.h" static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 2972c6ff8de..fea6dbe88cd 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -4,9 +4,6 @@ vfio_ss.add(files( 'container.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) -vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( - 'iommufd.c', -)) vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( 'display.c', 'pci-quirks.c', @@ -28,3 +25,6 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'migration-multifd.c', 'cpr.c', )) +system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( + 'iommufd.c', +))
Removing unused "exec/ram_addr.h" header allow to compile iommufd.c once for all targets. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/vfio/iommufd.c | 1 - hw/vfio/meson.build | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-)