Re: [PATCH v4 04/10] configure: add --disable-colo-proxy option

[Vladimir Sementsov-Ogievskiy]

On 09.05.23 21:42, Juan Quintela wrote:
> "Zhang, Chen" <chen.zhang@intel.com> wrote:
> > > -----Original Message-----
> > > From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
> > > Sent: Saturday, April 29, 2023 3:49 AM
> > > To: qemu-devel@nongnu.org
> > > Cc: lukasstraub2@web.de; quintela@redhat.com; Zhang, Chen
> > > <chen.zhang@intel.com>; vsementsov@yandex-team.ru; Paolo Bonzini
> > > <pbonzini@redhat.com>; Marc-André Lureau
> > > <marcandre.lureau@redhat.com>; Daniel P. Berrangé
> > > <berrange@redhat.com>; Thomas Huth <thuth@redhat.com>; Philippe
> > > Mathieu-Daudé <philmd@linaro.org>; Jason Wang <jasowang@redhat.com>
> > > Subject: [PATCH v4 04/10] configure: add --disable-colo-proxy option
> > >
> > > Add option to not build filter-mirror, filter-rewriter and colo-compare when
> > > they are not needed.
> >
> > Typo: This patch still build the filter-mirror/filter-redirector in 
> > filter-mirror.c.
> > Please remove the "filter-mirror" here.
> > Other code look good to me.
>
> Vladimir, I was doing this myself, with the bit attached.
>
> But then I noticed that one needs to also disable
> tests/qtest/test-filter-mirror and test-filter-rewriter.

Hmm, but we decided not touch filter-mirror in this patch, only filter-rewriter.

And there is no tests/qtest/test-filter-rewriter test.

> Can you resend with that fixed?  Or I am missing something more
> fundamental.
>
> Thanks, Juan.
>
> > > --- a/net/meson.build
> > > +++ b/net/meson.build
> > > @@ -1,13 +1,10 @@
> > >   softmmu_ss.add(files(
> > >     'announce.c',
> > >     'checksum.c',
> > > -  'colo-compare.c',
> > > -  'colo.c',
> > >     'dump.c',
> > >     'eth.c',
> > >     'filter-buffer.c',
> > >     'filter-mirror.c',
> > > -  'filter-rewriter.c',
> > >     'filter.c',
> > >     'hub.c',
> > >     'net-hmp-cmds.c',
> > > @@ -19,6 +16,16 @@ softmmu_ss.add(files(
> > >     'util.c',
> > >   ))
> > >
> > > +if get_option('replication').allowed() or \
> > > +    get_option('colo_proxy').allowed()
> > > +  softmmu_ss.add(files('colo-compare.c'))
> > > +  softmmu_ss.add(files('colo.c'))
> > > +endif
> > > +
> > > +if get_option('colo_proxy').allowed()
> > > +  softmmu_ss.add(files('filter-rewriter.c'))
> > > +endif
> > > +
> > >   softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
>
> This is the change needed, right?

No, we decided to keep filter-mirror as is.

> diff --git a/net/meson.build b/net/meson.build
> index 6f4ecde57f..e623bb9acb 100644
> --- a/net/meson.build
> +++ b/net/meson.build
> @@ -4,7 +4,6 @@ softmmu_ss.add(files(
>     'dump.c',
>     'eth.c',
>     'filter-buffer.c',
> -  'filter-mirror.c',
>     'filter.c',
>     'hub.c',
>     'net-hmp-cmds.c',
> @@ -23,7 +22,7 @@ if get_option('replication').allowed() or \
>   endif
>   
>   if get_option('colo_proxy').allowed()
> -  softmmu_ss.add(files('filter-rewriter.c'))
> +  softmmu_ss.add(files('filter-rewriter.c', 'filter-mirror.c'))
>   endif

--
Best regards,
Vladimir