> -----Original Message----- > From: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru> > Sent: Friday, April 28, 2023 5:30 AM > To: Lukas Straub <lukasstra...@web.de> > Cc: qemu-de...@nongnu.org; qemu-block@nongnu.org; > michael.r...@amd.com; arm...@redhat.com; ebl...@redhat.com; > jasow...@redhat.com; quint...@redhat.com; Zhang, Hailiang > <zhanghaili...@xfusion.com>; phi...@linaro.org; th...@redhat.com; > berra...@redhat.com; marcandre.lur...@redhat.com; > pbonz...@redhat.com; d...@treblig.org; hre...@redhat.com; > kw...@redhat.com; Zhang, Chen <chen.zh...@intel.com>; > lizhij...@fujitsu.com > Subject: Re: [PATCH v3 4/4] configure: add --disable-colo-proxy option > > On 28.04.23 00:18, Lukas Straub wrote: > > On Thu, 27 Apr 2023 23:29:46 +0300 > > Vladimir Sementsov-Ogievskiy<vsement...@yandex-team.ru> wrote: > > > >> Add option to not build filter-mirror, filter-rewriter and > >> colo-compare when they are not needed. > >> > >> There could be more agile configuration, for example add separate > >> options for each filter, but that may be done in future on demand. > >> The aim of this patch is to make possible to disable the whole COLO > >> Proxy subsystem. > >> > >> Signed-off-by: Vladimir > >> Sementsov-Ogievskiy<vsement...@yandex-team.ru> > >> --- > >> meson_options.txt | 2 ++ > >> net/meson.build | 14 ++++++++++---- > >> scripts/meson-buildoptions.sh | 3 +++ > >> stubs/colo-compare.c | 7 +++++++ > >> stubs/meson.build | 1 + > >> 5 files changed, 23 insertions(+), 4 deletions(-) > >> create mode 100644 stubs/colo-compare.c > >> > >> diff --git a/meson_options.txt b/meson_options.txt index > >> 2471dd02da..b59e7ae342 100644 > >> --- a/meson_options.txt > >> +++ b/meson_options.txt > >> @@ -289,6 +289,8 @@ option('live_block_migration', type: 'feature', > value: 'auto', > >> description: 'block migration in the main migration stream') > >> option('replication', type: 'feature', value: 'auto', > >> description: 'replication support') > >> +option('colo_proxy', type: 'feature', value: 'auto', > >> + description: 'colo-proxy support') > >> option('bochs', type: 'feature', value: 'auto', > >> description: 'bochs image format support') > >> option('cloop', type: 'feature', value: 'auto', diff --git > >> a/net/meson.build b/net/meson.build index 87afca3e93..4cfc850c69 > >> 100644 > >> --- a/net/meson.build > >> +++ b/net/meson.build > >> @@ -1,13 +1,9 @@ > >> softmmu_ss.add(files( > >> 'announce.c', > >> 'checksum.c', > >> - 'colo-compare.c', > >> - 'colo.c', > >> 'dump.c', > >> 'eth.c', > >> 'filter-buffer.c', > >> - 'filter-mirror.c',
Need fix here for filter-mirror.c too. > >> - 'filter-rewriter.c', > >> 'filter.c', > >> 'hub.c', > >> 'net-hmp-cmds.c', > >> @@ -19,6 +15,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-mirror.c', 'filter-rewriter.c')) > >> +endif > >> + > > The last discussion didn't really come to a conclusion, but I still > > think that 'filter-mirror.c' (which also contains filter-redirect) > > should be left unchanged. > > > > OK for me, I'll wait a bit for more comments and resend with > > @@ -22,7 +22,7 @@ if get_option('replication').allowed() or \ > endif > > if get_option('colo_proxy').allowed() > - softmmu_ss.add(files('filter-mirror.c', 'filter-rewriter.c')) > + softmmu_ss.add(files('filter-rewriter.c')) > endif > > softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c')) > > > applied here, if no other strong opinion. > It's OK to me except for the filter-mirror.c related comments. Thanks Chen > -- > Best regards, > Vladimir