From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 29 Jul 2022 14:07:59 +0000 (-0400)
Subject: Merge tag 'kvmarm-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmar... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c4edb2babc750d829cb551a6af7cb39b2afc9fb5;p=linux.git

Merge tag 'kvmarm-5.20' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 updates for 5.20:

- Unwinder implementations for both nVHE modes (classic and
  protected), complete with an overflow stack

- Rework of the sysreg access from userspace, with a complete
  rewrite of the vgic-v3 view to allign with the rest of the
  infrastructure

- Disagregation of the vcpu flags in separate sets to better track
  their use model.

- A fix for the GICv2-on-v3 selftest

- A small set of cosmetic fixes
---

c4edb2babc750d829cb551a6af7cb39b2afc9fb5
diff --cc tools/testing/selftests/kvm/aarch64/vgic_init.c
index e8cab9840aa37,21ba4002fc185..e05ecb31823fb
--- a/tools/testing/selftests/kvm/aarch64/vgic_init.c
+++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c
@@@ -661,9 -668,9 +661,9 @@@ int test_kvm_device(uint32_t gic_dev_ty
  	other = VGIC_DEV_IS_V2(gic_dev_type) ? KVM_DEV_TYPE_ARM_VGIC_V3
  					     : KVM_DEV_TYPE_ARM_VGIC_V2;
  
 -	if (!_kvm_create_device(v.vm, other, true, &fd)) {
 -		ret = _kvm_create_device(v.vm, other, false, &fd);
 +	if (!__kvm_test_create_device(v.vm, other)) {
 +		ret = __kvm_test_create_device(v.vm, other);
- 		TEST_ASSERT(ret && errno == EINVAL,
+ 		TEST_ASSERT(ret && (errno == EINVAL || errno == EEXIST),
  				"create GIC device while other version exists");
  	}