TEST_ASSERT_SUPPORTED_ATTRIBUTES() is supposedly reminding tha __vm_set_memory_attributes() does not support multiple attributes, but that is not really a problem; the tests need to know that multiple attributes can be overwritten, but that is not a problem for a simple wrapper around KVM_SET_MEMORY_ATTRIBUTES. Signed-off-by: Paolo Bonzini --- tools/testing/selftests/kvm/include/kvm_util.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index e2618877619e..7e480c034a87 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -473,14 +473,6 @@ static inline void vm_enable_cap(struct kvm_vm *vm, u32 cap, u64 arg0) int kvm_gpa_to_guest_memfd(struct kvm_vm *vm, gpa_t gpa, off_t *fd_offset, size_t *nr_bytes); -/* - * KVM_SET_MEMORY_ATTRIBUTES{,2} overwrites _all_ attributes. These - * flows need significant enhancements to support multiple attributes. - */ -#define TEST_ASSERT_SUPPORTED_ATTRIBUTES(attributes) \ - TEST_ASSERT(!(attributes) || (attributes) == KVM_MEMORY_ATTRIBUTE_PRIVATE, \ - "Update me to support multiple attributes!") - static inline void vm_set_memory_attributes(struct kvm_vm *vm, gpa_t gpa, size_t size, u64 attributes) { @@ -491,8 +483,6 @@ static inline void vm_set_memory_attributes(struct kvm_vm *vm, gpa_t gpa, .flags = 0, }; - TEST_ASSERT_SUPPORTED_ATTRIBUTES(attributes); - vm_ioctl(vm, KVM_SET_MEMORY_ATTRIBUTES, &attr); } @@ -543,8 +533,6 @@ static inline void gmem_set_memory_attributes(int fd, u64 offset, .flags = 0, }; - TEST_ASSERT_SUPPORTED_ATTRIBUTES(attributes); - __TEST_REQUIRE(kvm_check_cap(KVM_CAP_GUEST_MEMFD_MEMORY_ATTRIBUTES) > 0, "No valid attributes for guest_memfd ioctl!"); -- 2.52.0