KVM: selftests: Fix build for memstress.[ch] rename
PATCH 1/1 KVM: selftests: Fix build for memstress.[ch] rename
Today's -next fails to build the KVM selftests on at least arm64 due to commit
9fda6753c9dd ("KVM: selftests: Rename perf_test_util.[ch] to memstress.[ch]")
interacting poorly with commit
a93871d0ea9f ("KVM: selftests: Add a userfaultfd library")
which adds a new user of perf_test_util.h. Do the rename in the new user.
--- tools/testing/selftests/kvm/lib/userfaultfd_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/userfaultfd_util.c +1 -1
@@ -20,7 +20,7 @@#include "kvm_util.h" #include "test_util.h" -#include "perf_test_util.h" +#include "memstress.h" #include "userfaultfd_util.h" #ifdef __NR_userfaultfd
Signature · 1 line
2.30.2
Hi Mark,
Quoted 42 lines · On Tue, 6 Dec 2022 17:59:16 +0000 Mark Brown <[email protected]> wrote:
Today's -next fails to build the KVM selftests on at least arm64 due to commit
9fda6753c9dd("KVM: selftests: Rename perf_test_util.[ch] to memstress.[ch]")interacting poorly with commit
a93871d0ea9f("KVM: selftests: Add a userfaultfd library")which adds a new user of
perf_test_util.h. Do the rename in the new user.Fixes 9fda6753c9dd ("KVM: selftests: Rename perf_test_util.[ch] to memstress.[ch]")Fixes a93871d0ea9f ("KVM: selftests: Add a userfaultfd library")Signed-off-by Mark Brown <[email protected]>Cc Ricardo Koller <[email protected]>Cc Marc Zyngier <[email protected]>Cc David Matlack <[email protected]>Cc Sean Christopherson <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Stephen Rothwell <[email protected]>--- tools/testing/selftests/kvm/lib/userfaultfd_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/kvm/lib/userfaultfd_util.c +1
-1@@ -20,7 +20,7 @@#include "kvm_util.h" #include "test_util.h" -#include "perf_test_util.h" +#include "memstress.h" #include "userfaultfd_util.h" #ifdef __NR_userfaultfdSignature · 1 line
2.30.2
Thanks for that. I have added that as a merge fix patch to the kvm-arm merge. I assume this will be fixed up when that tree is merged into the kvm tree.
Signature · 2 lines
Cheers, Stephen Rothwell
Paolo Bonzini
maintainerQuoted 3 lines · Stephen Rothwell
Thanks for that. I have added that as a merge fix patch to the kvm-arm merge. I assume this will be fixed up when that tree is merged into the kvm tree.
Yes, I'll push as soon as I get confirmation that my own resolution is correct.
Paolo
Sean Christopherson
reviewer+Oliver
Quoted 7 lines · Paolo Bonzini
Quoted 3 lines · Stephen Rothwell
Thanks for that. I have added that as a merge fix patch to the kvm-arm merge. I assume this will be fixed up when that tree is merged into the kvm tree.
Yes, I'll push as soon as I get confirmation that my own resolution is correct.
Holler if you need/want help on getting arm's page_fault_test.c functional, I think Oliver is already poking at it.
Quoted 8 lines · Paolo Bonzini
Quoted 3 lines · Stephen Rothwell
Thanks for that. I have added that as a merge fix patch to the kvm-arm merge. I assume this will be fixed up when that tree is merged into the kvm tree.
Yes, I'll push as soon as I get confirmation that my own resolution is correct.
As I said in [1], things do build once you add [2] to the mix. I haven't had time to test the tests, but that shouldn't hold the push into -next.
M.
[1] https://lore.kernel.org/all/[email protected]
[2] https://lore.kernel.org/r/[email protected]
Signature · 1 line
Without deviation from the norm, progress is not possible.