diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-11 18:06:15 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-11 18:06:15 +0200 |
commit | 17a81bdb4ee441bcbf09ec76f530197c3788d610 (patch) | |
tree | 9385f7487c54d8d5f730da6b2f8b0d64730977dc /tools/testing/selftests/kvm/include | |
parent | KVM: VMX: Stop the preemption timer during vCPU reset (diff) | |
parent | KVM: selftests: Test invalid bits in kvm_valid_regs and kvm_dirty_regs on s390x (diff) | |
download | linux-dev-17a81bdb4ee441bcbf09ec76f530197c3788d610.tar.xz linux-dev-17a81bdb4ee441bcbf09ec76f530197c3788d610.zip |
Merge tag 'kvm-s390-next-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
* More selftests
* Improved KVM_S390_MEM_OP ioctl input checking
* Add kvm_valid_regs and kvm_dirty_regs invalid bit checking
Diffstat (limited to 'tools/testing/selftests/kvm/include')
-rw-r--r-- | tools/testing/selftests/kvm/include/kvm_util.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index e0e66b115ef2..5463b7896a0a 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -165,12 +165,6 @@ int vm_create_device(struct kvm_vm *vm, struct kvm_create_device *cd); memcpy(&(g), _p, sizeof(g)); \ }) -/* ucall implementation types */ -typedef enum { - UCALL_PIO, - UCALL_MMIO, -} ucall_type_t; - /* Common ucalls */ enum { UCALL_NONE, @@ -186,7 +180,7 @@ struct ucall { uint64_t args[UCALL_MAX_ARGS]; }; -void ucall_init(struct kvm_vm *vm, ucall_type_t type, void *arg); +void ucall_init(struct kvm_vm *vm, void *arg); void ucall_uninit(struct kvm_vm *vm); void ucall(uint64_t cmd, int nargs, ...); uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); |