[Qemu-devel] [RFC PATCH] configure: remove --enable-replication/--disable-replication

[Paolo Bonzini]

The replication feature is a small amount of code, does not
require any external library and unless used does not add
anything to the guest's attack surface.  Since any extra
configure option affects maintainability on the other hand
and is subject to bit rot, I think there is no need to
make it configurable.

Signed-off-by: Paolo Bonzini <address@hidden>
---
        Sending as RFC to start discussion because I know
        Dave Gilbert disagrees. :)

 Makefile.objs          |  2 +-
 block/Makefile.objs    |  2 +-
 configure              | 11 -----------
 tests/Makefile.include |  2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index 01cef86..d834906 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -15,7 +15,7 @@ block-obj-$(CONFIG_POSIX) += aio-posix.o
 block-obj-$(CONFIG_WIN32) += aio-win32.o
 block-obj-y += block/
 block-obj-y += qemu-io-cmds.o
-block-obj-$(CONFIG_REPLICATION) += replication.o
+block-obj-y += replication.o
 
 block-obj-m = block/
 
diff --git a/block/Makefile.objs b/block/Makefile.objs
index c6bd14e..fd099a6 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -24,7 +24,7 @@ block-obj-$(CONFIG_LIBSSH2) += ssh.o
 block-obj-y += accounting.o dirty-bitmap.o
 block-obj-y += write-threshold.o
 block-obj-y += backup.o
-block-obj-$(CONFIG_REPLICATION) += replication.o
+block-obj-y += replication.o
 
 block-obj-y += crypto.o
 
diff --git a/configure b/configure
index 86fd833..0cb124e 100755
--- a/configure
+++ b/configure
@@ -320,7 +320,6 @@ libssh2=""
 numa=""
 tcmalloc="no"
 jemalloc="no"
-replication="yes"
 
 # parse CC options first
 for opt do
@@ -1166,10 +1165,6 @@ for opt do
   ;;
   --enable-jemalloc) jemalloc="yes"
   ;;
-  --disable-replication) replication="no"
-  ;;
-  --enable-replication) replication="yes"
-  ;;
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
@@ -1402,7 +1397,6 @@ disabled with --disable-FEATURE, default is enabled if 
available:
   numa            libnuma support
   tcmalloc        tcmalloc support
   jemalloc        jemalloc support
-  replication     replication support
 
 NOTE: The object files are built at the place where configure is launched
 EOF
@@ -5113,7 +5107,6 @@ echo "NUMA host support $numa"
 echo "tcmalloc support  $tcmalloc"
 echo "jemalloc support  $jemalloc"
 echo "avx2 optimization $avx2_opt"
-echo "replication support $replication"
 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -5711,10 +5704,6 @@ if test "$have_rtnetlink" = "yes" ; then
   echo "CONFIG_RTNETLINK=y" >> $config_host_mak
 fi
 
-if test "$replication" = "yes" ; then
-  echo "CONFIG_REPLICATION=y" >> $config_host_mak
-fi
-
 if test "$have_af_vsock" = "yes" ; then
   echo "CONFIG_AF_VSOCK=y" >> $config_host_mak
 fi
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 33b4f88..77dc08f 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -115,7 +115,7 @@ check-unit-y += tests/test-crypto-xts$(EXESUF)
 check-unit-y += tests/test-crypto-block$(EXESUF)
 gcov-files-test-logging-y = tests/test-logging.c
 check-unit-y += tests/test-logging$(EXESUF)
-check-unit-$(CONFIG_REPLICATION) += tests/test-replication$(EXESUF)
+check-unit-y += tests/test-replication$(EXESUF)
 check-unit-y += tests/test-bufferiszero$(EXESUF)
 gcov-files-check-bufferiszero-y = util/bufferiszero.c
 check-unit-y += tests/test-uuid$(EXESUF)
-- 
2.9.3