On Thu, 20 Apr 2023 09:09:48 +0000 "Zhang, Chen" <chen.zh...@intel.com> wrote:
> > -----Original Message-----
> > From: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru>
> > Sent: Thursday, April 20, 2023 6:53 AM
> > To: qemu-devel@nongnu.org
> > Cc: qemu-bl...@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; Vladimir Sementsov-Ogievskiy <vsementsov@yandex-
> > team.ru>
> > Subject: [PATCH v2 4/4] configure: add --disable-colo-filters option
> >
> > Add option to not build COLO Proxy subsystem if it is not needed.
>
> I think no need to add the --disable-colo-filter option.
> Net-filters just general infrastructure. Another example is COLO also
> use the -chardev socket to connect each filters. No need to add the
> --disable-colo-chardev....
> Please drop this patch.
> But for COLO network part, still something need to do:
> You can add --disable-colo-proxy not to build the net/colo-compare.c if it
> is not needed.
> This file just for COLO and not belong to network filters.
And net/filter-rewriter.c is just for COLO too.
So in summary just drop net/filter-mirror.c from this patch?
>
> Thanks
> Chen
>
> >
> > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru>
> > ---
> > meson.build | 1 +
> > meson_options.txt | 2 ++
> > net/meson.build | 11 ++++++++---
> > scripts/meson-buildoptions.sh | 3 +++
> > 4 files changed, 14 insertions(+), 3 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index c44d05a13f..5b2fdfbd3a 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1962,6 +1962,7 @@ config_host_data.set('CONFIG_GPROF',
> > get_option('gprof'))
> > config_host_data.set('CONFIG_LIVE_BLOCK_MIGRATION',
> > get_option('live_block_migration').allowed())
> > config_host_data.set('CONFIG_QOM_CAST_DEBUG',
> > get_option('qom_cast_debug'))
> > config_host_data.set('CONFIG_REPLICATION',
> > get_option('replication').allowed())
> > +config_host_data.set('CONFIG_COLO_FILTERS',
> > +get_option('colo_filters').allowed())
> >
> > # has_header
> > config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h')) diff
> > --git
> > a/meson_options.txt b/meson_options.txt index fc9447d267..ffe81317cb
> > 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_filters', type: 'feature', value: 'auto',
> > + description: 'colo_filters 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
> > 38d50b8c96..7e54744aea 100644
> > --- a/net/meson.build
> > +++ b/net/meson.build
> > @@ -1,12 +1,9 @@
> > softmmu_ss.add(files(
> > 'announce.c',
> > 'checksum.c',
> > - 'colo.c',
> > 'dump.c',
> > 'eth.c',
> > 'filter-buffer.c',
> > - 'filter-mirror.c',
> > - 'filter-rewriter.c',
> > 'filter.c',
> > 'hub.c',
> > 'net-hmp-cmds.c',
> > @@ -22,6 +19,14 @@ if get_option('replication').allowed()
> > softmmu_ss.add(files('colo-compare.c'))
> > endif
> >
> > +if get_option('replication').allowed() or
> > +get_option('colo_filters').allowed()
> > + softmmu_ss.add(files('colo.c'))
> > +endif
> > +
> > +if get_option('colo_filters').allowed()
> > + softmmu_ss.add(files('filter-mirror.c', 'filter-rewriter.c')) endif
> > +
> > softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
> >
> > if have_l2tpv3
> > diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
> > index 009fab1515..cf9d23369f 100644
> > --- a/scripts/meson-buildoptions.sh
> > +++ b/scripts/meson-buildoptions.sh
> > @@ -83,6 +83,7 @@ meson_options_help() {
> > printf "%s\n" ' capstone Whether and how to find the capstone
> > library'
> > printf "%s\n" ' cloop cloop image format support'
> > printf "%s\n" ' cocoa Cocoa user interface (macOS only)'
> > + printf "%s\n" ' colo-filters colo_filters support'
> > printf "%s\n" ' coreaudio CoreAudio sound support'
> > printf "%s\n" ' crypto-afalg Linux AF_ALG crypto backend driver'
> > printf "%s\n" ' curl CURL block device driver'
> > @@ -236,6 +237,8 @@ _meson_option_parse() {
> > --disable-cloop) printf "%s" -Dcloop=disabled ;;
> > --enable-cocoa) printf "%s" -Dcocoa=enabled ;;
> > --disable-cocoa) printf "%s" -Dcocoa=disabled ;;
> > + --enable-colo-filters) printf "%s" -Dcolo_filters=enabled ;;
> > + --disable-colo-filters) printf "%s" -Dcolo_filters=disabled ;;
> > --enable-coreaudio) printf "%s" -Dcoreaudio=enabled ;;
> > --disable-coreaudio) printf "%s" -Dcoreaudio=disabled ;;
> > --enable-coroutine-pool) printf "%s" -Dcoroutine_pool=true ;;
> > --
> > 2.34.1
>
>
--
pgpYiLAkTesFC.pgp
Description: OpenPGP digital signature
