On Wed, Sep 21, 2022, Vitaly Kuznetsov wrote: > diff --git a/tools/testing/selftests/kvm/include/x86_64/hyperv.h b/tools/testing/selftests/kvm/include/x86_64/hyperv.h > index 42213f5de17f..e00ce9e122f4 100644 > --- a/tools/testing/selftests/kvm/include/x86_64/hyperv.h > +++ b/tools/testing/selftests/kvm/include/x86_64/hyperv.h > @@ -265,4 +265,19 @@ extern struct hv_vp_assist_page *current_vp_assist; > > int enable_vp_assist(uint64_t vp_assist_pa, void *vp_assist); > > +struct hyperv_test_pages { > + /* VP assist page */ > + void *vp_assist_hva; > + uint64_t vp_assist_gpa; > + void *vp_assist; > + > + /* Enlightened VMCS */ > + void *enlightened_vmcs_hva; > + uint64_t enlightened_vmcs_gpa; > + void *enlightened_vmcs; FYI (in case you or someone else is tempted to do further cleanup), at some point there will be a patch to wrap these triplets[*] to cut down on the copy+paste. [*] https://lore.kernel.org/all/YwznLAqRb2i4lHiH@xxxxxxxxxx > +}; > + > +struct hyperv_test_pages * > +vcpu_alloc_hyperv_test_pages(struct kvm_vm *vm, vm_vaddr_t *p_hv_pages_gva); Please don't wrap before the function name.