linux-next: manual merge of the kvm-arm tree with the kvm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the kvm-arm tree got conflicts in:

  tools/testing/selftests/kvm/access_tracking_perf_test.c
  tools/testing/selftests/kvm/memslot_modification_stress_test.c

between commit:

  7812d80c0f89 ("KVM: selftests: Rename perf_test_util symbols to memstress")

from the kvm tree and commit:

  9ec1eb1bccee ("KVM: selftests: Have perf_test_util signal when to stop vCPUs")

from the kvm-arm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/kvm/access_tracking_perf_test.c
index 02d3587cab0a,942370d57392..000000000000
--- a/tools/testing/selftests/kvm/access_tracking_perf_test.c
+++ b/tools/testing/selftests/kvm/access_tracking_perf_test.c
@@@ -321,11 -318,8 +318,8 @@@ static void run_test(enum vm_guest_mod
  	mark_memory_idle(vm, nr_vcpus);
  	access_memory(vm, nr_vcpus, ACCESS_READ, "Reading from idle memory");
  
- 	/* Set done to signal the vCPU threads to exit */
- 	done = true;
- 
 -	perf_test_join_vcpu_threads(nr_vcpus);
 -	perf_test_destroy_vm(vm);
 +	memstress_join_vcpu_threads(nr_vcpus);
 +	memstress_destroy_vm(vm);
  }
  
  static void help(char *name)
diff --cc tools/testing/selftests/kvm/memslot_modification_stress_test.c
index d07e921bfcc5,3a5e4518307c..000000000000
--- a/tools/testing/selftests/kvm/memslot_modification_stress_test.c
+++ b/tools/testing/selftests/kvm/memslot_modification_stress_test.c
@@@ -34,9 -34,7 +34,7 @@@
  static int nr_vcpus = 1;
  static uint64_t guest_percpu_mem_size = DEFAULT_PER_VCPU_MEM_SIZE;
  
- static bool run_vcpus = true;
- 
 -static void vcpu_worker(struct perf_test_vcpu_args *vcpu_args)
 +static void vcpu_worker(struct memstress_vcpu_args *vcpu_args)
  {
  	struct kvm_vcpu *vcpu = vcpu_args->vcpu;
  	struct kvm_run *run;
@@@ -107,14 -105,13 +105,12 @@@ static void run_test(enum vm_guest_mod
  
  	pr_info("Started all vCPUs\n");
  
 -	add_remove_memslot(vm, p->memslot_modification_delay,
 -			   p->nr_memslot_modifications);
 +	add_remove_memslot(vm, p->delay, p->nr_iterations);
  
- 	run_vcpus = false;
- 
 -	perf_test_join_vcpu_threads(nr_vcpus);
 +	memstress_join_vcpu_threads(nr_vcpus);
  	pr_info("All vCPU threads joined\n");
  
 -	perf_test_destroy_vm(vm);
 +	memstress_destroy_vm(vm);
  }
  
  static void help(char *name)

Attachment: pgpWpL4GcIjQj.pgp
Description: OpenPGP digital signature