* [PATCH] KVM: selftests: Fix build due to ucall_uninit() removal
@ 2022-12-06 18:15 Mark Brown
2022-12-06 20:49 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2022-12-06 18:15 UTC (permalink / raw)
To: Paolo Bonzini, Shuah Khan, Marc Zyngier
Cc: kvmarm, kvm, linux-next, linux-kselftest, Stephen Rothwell,
Mark Brown, Sean Christopherson, Ricardo Koller
Today's -next fails to build on arm64 due to:
In file included from include/kvm_util.h:11,
from aarch64/page_fault_test.c:15:
include/ucall_common.h:36:47: note: expected ‘vm_paddr_t’ {aka ‘long unsigned int’} but argument is of type ‘void *’
36 | void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa);
| ~~~~~~~~~~~^~~~~~~~
aarch64/page_fault_test.c:725:2: warning: implicit declaration of function ‘ucall_uninit’; did you mean ‘ucall_init’? [-Wimplicit-function-declaration]
725 | ucall_uninit(vm);
| ^~~~~~~~~~~~
| ucall_init
which is caused by commit
interacting poorly with commit
28a65567acb5 ("KVM: selftests: Drop now-unnecessary ucall_uninit()")
As is done for other ucall_uninit() users remove the call in the newly added
page_fault_test.c.
Fixes: 28a65567acb5 ("KVM: selftests: Drop now-unnecessary ucall_uninit()")
Fixes: 35c581015712 ("KVM: selftests: aarch64: Add aarch64/page_fault_test")
Signed-off-by: Mark Brown <broonie@kernel•org>
Cc: Sean Christopherson <seanjc@google•com>
Cc: Ricardo Koller <ricarkol@google•com>
Cc: Marc Zyngier <maz@kernel•org>
---
tools/testing/selftests/kvm/aarch64/page_fault_test.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/testing/selftests/kvm/aarch64/page_fault_test.c b/tools/testing/selftests/kvm/aarch64/page_fault_test.c
index 05bb6a6369c2..4ef89c57a937 100644
--- a/tools/testing/selftests/kvm/aarch64/page_fault_test.c
+++ b/tools/testing/selftests/kvm/aarch64/page_fault_test.c
@@ -722,7 +722,6 @@ static void run_test(enum vm_guest_mode mode, void *arg)
vcpu_run_loop(vm, vcpu, test);
- ucall_uninit(vm);
kvm_vm_free(vm);
free_uffd(test, pt_uffd, data_uffd);
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] KVM: selftests: Fix build due to ucall_uninit() removal
2022-12-06 18:15 [PATCH] KVM: selftests: Fix build due to ucall_uninit() removal Mark Brown
@ 2022-12-06 20:49 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-12-06 20:49 UTC (permalink / raw)
To: Mark Brown
Cc: Paolo Bonzini, Shuah Khan, Marc Zyngier, kvmarm, kvm, linux-next,
linux-kselftest, Sean Christopherson, Ricardo Koller
[-- Attachment #1: Type: text/plain, Size: 2074 bytes --]
Hi Mark,
On Tue, 6 Dec 2022 18:15:06 +0000 Mark Brown <broonie@kernel•org> wrote:
>
> Today's -next fails to build on arm64 due to:
>
> In file included from include/kvm_util.h:11,
> from aarch64/page_fault_test.c:15:
> include/ucall_common.h:36:47: note: expected ‘vm_paddr_t’ {aka ‘long unsigned int’} but argument is of type ‘void *’
> 36 | void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa);
> | ~~~~~~~~~~~^~~~~~~~
> aarch64/page_fault_test.c:725:2: warning: implicit declaration of function ‘ucall_uninit’; did you mean ‘ucall_init’? [-Wimplicit-function-declaration]
> 725 | ucall_uninit(vm);
> | ^~~~~~~~~~~~
> | ucall_init
>
> which is caused by commit
>
> interacting poorly with commit
>
> 28a65567acb5 ("KVM: selftests: Drop now-unnecessary ucall_uninit()")
>
> As is done for other ucall_uninit() users remove the call in the newly added
> page_fault_test.c.
>
> Fixes: 28a65567acb5 ("KVM: selftests: Drop now-unnecessary ucall_uninit()")
> Fixes: 35c581015712 ("KVM: selftests: aarch64: Add aarch64/page_fault_test")
> Signed-off-by: Mark Brown <broonie@kernel•org>
> Cc: Sean Christopherson <seanjc@google•com>
> Cc: Ricardo Koller <ricarkol@google•com>
> Cc: Marc Zyngier <maz@kernel•org>
> ---
> tools/testing/selftests/kvm/aarch64/page_fault_test.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/page_fault_test.c b/tools/testing/selftests/kvm/aarch64/page_fault_test.c
> index 05bb6a6369c2..4ef89c57a937 100644
> --- a/tools/testing/selftests/kvm/aarch64/page_fault_test.c
> +++ b/tools/testing/selftests/kvm/aarch64/page_fault_test.c
> @@ -722,7 +722,6 @@ static void run_test(enum vm_guest_mode mode, void *arg)
>
> vcpu_run_loop(vm, vcpu, test);
>
> - ucall_uninit(vm);
> kvm_vm_free(vm);
> free_uffd(test, pt_uffd, data_uffd);
>
> --
> 2.30.2
>
Also added to my merge of the kvm-arm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-06 20:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-06 18:15 [PATCH] KVM: selftests: Fix build due to ucall_uninit() removal Mark Brown
2022-12-06 20:49 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox