* Kirti Wankhede (kwankh...@nvidia.com) wrote:
>
>
> On 11/26/2020 12:33 AM, Dr. David Alan Gilbert wrote:
> > * Kirti Wankhede (kwankh...@nvidia.com) wrote:
> > >
> > >
> > > On 11/25/2020 3:00 PM, Dr. David Alan Gilbert wrote:
> > > > * Kirti Wankhede (kwankh...@nvidia.com) wrote:
> > > > > Header file where CONFIG_VFIO is defined is not included in
> > > > > migration.c
> > > > > file. Include config devices header file in migration.c.
> > > > >
> > > > > Fixes: 3710586caa5d ("qapi: Add VFIO devices migration stats in
> > > > > Migration
> > > > > stats")
> > > > >
> > > > > Signed-off-by: Kirti Wankhede <kwankh...@nvidia.com>
> > > >
> > > > Given it's got build problems; I suggest actually something cleaner
> > > > would be to swing populate_vfio_info into one of the vfio specific
> > > > files, add a stubs/ entry somewhere and then migration.c doesn't need
> > > > to include the device or header stuff.
> > > >
> > >
> > > Still function prototype for populate_vfio_info() and its stub has to be
> > > placed in some header file.
> >
> > Which header file isn't that important;
>
> Any recommendation which header file to use?
I guess ./include/hw/vfio/vfio.h or one of the other vfio headers that
works even if vfio isn't configured?
Dave
> Thanks,
> Kirti
>
> > and the stub goes in a file in
> > stubs/
> >
> > > Earlier I used CONFIG_LINUX instead of CONFIG_VFIO which works here.
> > > Should
> > > I change it back to CONFIG_LINUX?
> >
> > No.
> >
> > > I'm not very much aware of meson build system, I tested by configuring
> > > specific target, but I think by default if target build is not specified
> > > during configuration, it builds for multiple target that's where this
> > > build
> > > is failing. Any help on how to fix it would be helpful.
> >
> > With my suggestion you don't have to do anything clever to meson
> > (which I don't know much about either).
> >
> > Dave
> >
> > > Thanks,
> > > Kirti
> > >
> > > > Dave
> > > >
> > > > > ---
> > > > > meson.build | 1 +
> > > > > migration/migration.c | 1 +
> > > > > 2 files changed, 2 insertions(+)
> > > > >
> > > > > diff --git a/meson.build b/meson.build
> > > > > index 7ddf983ff7f5..24526499cfb5 100644
> > > > > --- a/meson.build
> > > > > +++ b/meson.build
> > > > > @@ -1713,6 +1713,7 @@ common_ss.add_all(when: 'CONFIG_USER_ONLY',
> > > > > if_true: user_ss)
> > > > > common_all = common_ss.apply(config_all, strict: false)
> > > > > common_all = static_library('common',
> > > > > +
> > > > > c_args:'-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target) ,
> > > > > build_by_default: false,
> > > > > sources: common_all.sources() + genh,
> > > > > dependencies:
> > > > > common_all.dependencies(),
> > > > > diff --git a/migration/migration.c b/migration/migration.c
> > > > > index 87a9b59f83f4..650efb81daad 100644
> > > > > --- a/migration/migration.c
> > > > > +++ b/migration/migration.c
> > > > > @@ -57,6 +57,7 @@
> > > > > #include "qemu/queue.h"
> > > > > #include "multifd.h"
> > > > > +#include CONFIG_DEVICES
> > > > > #ifdef CONFIG_VFIO
> > > > > #include "hw/vfio/vfio-common.h"
> > > > > #endif
> > > > > --
> > > > > 2.7.0
> > > > >
> > >
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
