Skip to content

Commit

Permalink
build: remove --enable-colo/--disable-colo
Browse files Browse the repository at this point in the history
No need to provide this knob, so remove it and stubs/migration-colo.c.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Jan 16, 2017
1 parent d6da1e9 commit a15215f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 60 deletions.
11 changes: 0 additions & 11 deletions configure
Expand Up @@ -228,7 +228,6 @@ vhost_net="no"
vhost_scsi="no"
vhost_vsock="no"
kvm="no"
colo="yes"
rdma=""
gprof="no"
debug_tcg="no"
Expand Down Expand Up @@ -920,10 +919,6 @@ for opt do
;;
--enable-kvm) kvm="yes"
;;
--disable-colo) colo="no"
;;
--enable-colo) colo="yes"
;;
--disable-tcg-interpreter) tcg_interpreter="no"
;;
--enable-tcg-interpreter) tcg_interpreter="yes"
Expand Down Expand Up @@ -1372,7 +1367,6 @@ disabled with --disable-FEATURE, default is enabled if available:
fdt fdt device tree
bluez bluez stack connectivity
kvm KVM acceleration support
colo COarse-grain LOck-stepping VM for Non-stop Service
rdma RDMA-based migration support
vde support for vde network
netmap support for netmap network
Expand Down Expand Up @@ -5062,7 +5056,6 @@ echo "Linux AIO support $linux_aio"
echo "ATTR/XATTR support $attr"
echo "Install blobs $blobs"
echo "KVM support $kvm"
echo "COLO support $colo"
echo "RDMA support $rdma"
echo "TCG interpreter $tcg_interpreter"
echo "fdt support $fdt"
Expand Down Expand Up @@ -5701,10 +5694,6 @@ if have_backend "syslog"; then
fi
echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak

if test "$colo" = "yes"; then
echo "CONFIG_COLO=y" >> $config_host_mak
fi

if test "$rdma" = "yes" ; then
echo "CONFIG_RDMA=y" >> $config_host_mak
fi
Expand Down
3 changes: 1 addition & 2 deletions migration/Makefile.objs
@@ -1,7 +1,6 @@
common-obj-y += migration.o socket.o fd.o exec.o
common-obj-y += tls.o
common-obj-y += colo-comm.o
common-obj-$(CONFIG_COLO) += colo.o colo-failover.o
common-obj-y += colo-comm.o colo.o colo-failover.o
common-obj-y += vmstate.o
common-obj-y += qemu-file.o
common-obj-y += qemu-file-channel.o
Expand Down
1 change: 0 additions & 1 deletion stubs/Makefile.objs
Expand Up @@ -36,4 +36,3 @@ stub-obj-y += qmp_pc_dimm_device_list.o
stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
stub-obj-y += pc_madt_cpu_entry.o
stub-obj-y += migration-colo.o
46 changes: 0 additions & 46 deletions stubs/migration-colo.c

This file was deleted.

0 comments on commit a15215f

Please sign in to comment.