linux-next: manual merge of the kvm tree with the kvms390-fixes tree

[broonie@xxxxxxxxxx]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  tools/testing/selftests/kvm/s390x/tprot.c

between commit:

  fd35ba6add67a ("KVM: s390: selftests: Use TAP interface in the tprot test")

from the kvms390-fixes tree and commit:

  0c073227df505 ("KVM: s390: selftests: Use TAP interface in the tprot test")

and subsequent commits from the kvm 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.

diff --cc tools/testing/selftests/kvm/s390x/memop.c
index e704c6fa5758e,9113696d5178a..0000000000000
--- a/tools/testing/selftests/kvm/s390x/memop.c
+++ b/tools/testing/selftests/kvm/s390x/memop.c
diff --cc tools/testing/selftests/kvm/s390x/resets.c
index 889449a22e7ad,19486084eb309..0000000000000
--- a/tools/testing/selftests/kvm/s390x/resets.c
+++ b/tools/testing/selftests/kvm/s390x/resets.c
diff --cc tools/testing/selftests/kvm/s390x/tprot.c
index 14d74a9e7b3d4,a9a0b76e5fa45..0000000000000
--- a/tools/testing/selftests/kvm/s390x/tprot.c
+++ b/tools/testing/selftests/kvm/s390x/tprot.c
@@@ -183,30 -181,29 +181,35 @@@ static void guest_code(void
  	GUEST_SYNC(perform_next_stage(&i, mapped_0));
  }
  
- #define HOST_SYNC_NO_TAP(vmp, stage)						\
- ({										\
- 	struct kvm_vm *__vm = (vmp);						\
- 	struct ucall uc;							\
- 	int __stage = (stage);							\
- 										\
- 	vcpu_run(__vm, VCPU_ID);						\
- 	get_ucall(__vm, VCPU_ID, &uc);						\
- 	if (uc.cmd == UCALL_ABORT) {						\
- 		TEST_FAIL("line %lu: %s, hints: %lu, %lu", uc.args[1],		\
- 			  (const char *)uc.args[0], uc.args[2], uc.args[3]);	\
- 	}									\
- 	ASSERT_EQ(uc.cmd, UCALL_SYNC);						\
- 	ASSERT_EQ(uc.args[1], __stage);						\
+ #define HOST_SYNC_NO_TAP(vcpup, stage)				\
+ ({								\
+ 	struct kvm_vcpu *__vcpu = (vcpup);			\
+ 	struct ucall uc;					\
+ 	int __stage = (stage);					\
+ 								\
+ 	vcpu_run(__vcpu);					\
+ 	get_ucall(__vcpu, &uc);					\
+ 	if (uc.cmd == UCALL_ABORT)				\
+ 		REPORT_GUEST_ASSERT_2(uc, "hints: %lu, %lu");	\
+ 	ASSERT_EQ(uc.cmd, UCALL_SYNC);				\
+ 	ASSERT_EQ(uc.args[1], __stage);				\
+ })
+ 
+ #define HOST_SYNC(vcpu, stage)			\
+ ({						\
+ 	HOST_SYNC_NO_TAP(vcpu, stage);		\
+ 	ksft_test_result_pass("" #stage "\n");	\
  })
  
 +#define HOST_SYNC(vmp, stage)			\
 +({						\
 +	HOST_SYNC_NO_TAP(vmp, stage);		\
 +	ksft_test_result_pass("" #stage "\n");	\
 +})
 +
  int main(int argc, char *argv[])
  {
+ 	struct kvm_vcpu *vcpu;
  	struct kvm_vm *vm;
  	struct kvm_run *run;
  	vm_vaddr_t guest_0_page;