| From 461fbbc244f45b95a6d9e4a10d7616c9ec12e15e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 22 Dec 2022 18:09:58 -0600 |
| Subject: KVM: selftests: Fix build regression by using accessor function |
| |
| From: Tyler Hicks <code@tyhicks.com> |
| |
| Fix the stable backport of commit 05c2224d4b04 ("KVM: selftests: Fix |
| number of pages for memory slot in memslot_modification_stress_test"), |
| which caused memslot_modification_stress_test.c build failures due to |
| trying to access private members of struct kvm_vm. |
| |
| v6.0 commit b530eba14c70 ("KVM: selftests: Get rid of |
| kvm_util_internal.h") and some other commits got rid of the accessors |
| and made all of the KVM data structures public. Keep using the accessors |
| in older kernels. |
| |
| There is no corresponding upstream commit for this change. |
| |
| Signed-off-by: Tyler Hicks (Microsoft) <code@tyhicks.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/selftests/kvm/memslot_modification_stress_test.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/tools/testing/selftests/kvm/memslot_modification_stress_test.c b/tools/testing/selftests/kvm/memslot_modification_stress_test.c |
| index 1d806b8ffee2..766c1790df66 100644 |
| --- a/tools/testing/selftests/kvm/memslot_modification_stress_test.c |
| +++ b/tools/testing/selftests/kvm/memslot_modification_stress_test.c |
| @@ -72,7 +72,7 @@ struct memslot_antagonist_args { |
| static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay, |
| uint64_t nr_modifications) |
| { |
| - uint64_t pages = max_t(int, vm->page_size, getpagesize()) / vm->page_size; |
| + uint64_t pages = max_t(int, vm_get_page_size(vm), getpagesize()) / vm_get_page_size(vm); |
| uint64_t gpa; |
| int i; |
| |
| -- |
| 2.35.1 |
| |