build: remove --enable-colo/--disable-colo
No need to provide this knob, so remove it and stubs/migration-colo.c. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
		
							parent
							
								
									d6da1e9eca
								
							
						
					
					
						commit
						a15215f3e1
					
				
							
								
								
									
										11
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								configure
									
									
									
									
										vendored
									
									
								
							| @ -228,7 +228,6 @@ vhost_net="no" | ||||
| vhost_scsi="no" | ||||
| vhost_vsock="no" | ||||
| kvm="no" | ||||
| colo="yes" | ||||
| rdma="" | ||||
| gprof="no" | ||||
| debug_tcg="no" | ||||
| @ -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" | ||||
| @ -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 | ||||
| @ -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" | ||||
| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -1,46 +0,0 @@ | ||||
| /*
 | ||||
|  * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) | ||||
|  * (a.k.a. Fault Tolerance or Continuous Replication) | ||||
|  * | ||||
|  * Copyright (c) 2016 HUAWEI TECHNOLOGIES CO., LTD. | ||||
|  * Copyright (c) 2016 FUJITSU LIMITED | ||||
|  * Copyright (c) 2016 Intel Corporation | ||||
|  * | ||||
|  * This work is licensed under the terms of the GNU GPL, version 2 or | ||||
|  * later.  See the COPYING file in the top-level directory. | ||||
|  */ | ||||
| 
 | ||||
| #include "qemu/osdep.h" | ||||
| #include "migration/colo.h" | ||||
| #include "qmp-commands.h" | ||||
| 
 | ||||
| bool colo_supported(void) | ||||
| { | ||||
|     return false; | ||||
| } | ||||
| 
 | ||||
| bool migration_in_colo_state(void) | ||||
| { | ||||
|     return false; | ||||
| } | ||||
| 
 | ||||
| bool migration_incoming_in_colo_state(void) | ||||
| { | ||||
|     return false; | ||||
| } | ||||
| 
 | ||||
| void migrate_start_colo_process(MigrationState *s) | ||||
| { | ||||
| } | ||||
| 
 | ||||
| void *colo_process_incoming_thread(void *opaque) | ||||
| { | ||||
|     return NULL; | ||||
| } | ||||
| 
 | ||||
| void qmp_x_colo_lost_heartbeat(Error **errp) | ||||
| { | ||||
|     error_setg(errp, "COLO is not supported, please rerun configure" | ||||
|                      " with --enable-colo option in order to support" | ||||
|                      " COLO feature"); | ||||
| } | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Paolo Bonzini
						Paolo Bonzini