| Message ID | 20210318151624.490861-1-eesposit@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] kvm/kvm_util: add _vm_ioctl | expand |
On 18/03/21 16:16, Emanuele Giuseppe Esposito wrote: > As in kvm_ioctl and _kvm_ioctl, add > the respective _vm_ioctl for vm_ioctl. > > _vm_ioctl invokes an ioctl using the vm fd, > leaving the caller to test the result. Slightly better subject: "selftests/kvm: add _vm_ioctl". Queued both, but next time please include a cover letter too. Thanks! Paolo > > Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> > --- > tools/testing/selftests/kvm/include/kvm_util.h | 1 + > tools/testing/selftests/kvm/lib/kvm_util.c | 7 ++++++- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h > index 2d7eb6989e83..d53a5f7cad61 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -133,6 +133,7 @@ void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl, > int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl, > void *arg); > void vm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); > +int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg); > void kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); > int _kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); > void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags); > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index e5fbf16f725b..b8849a1aca79 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -1697,11 +1697,16 @@ void vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) > { > int ret; > > - ret = ioctl(vm->fd, cmd, arg); > + ret = _vm_ioctl(vm, cmd, arg); > TEST_ASSERT(ret == 0, "vm ioctl %lu failed, rc: %i errno: %i (%s)", > cmd, ret, errno, strerror(errno)); > } > > +int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) > +{ > + return ioctl(vm->fd, cmd, arg); > +} > + > /* > * KVM system ioctl > * >
On Thu, Mar 18, 2021 at 04:16:23PM +0100, Emanuele Giuseppe Esposito wrote: > As in kvm_ioctl and _kvm_ioctl, add > the respective _vm_ioctl for vm_ioctl. > > _vm_ioctl invokes an ioctl using the vm fd, > leaving the caller to test the result. > > Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> > --- > tools/testing/selftests/kvm/include/kvm_util.h | 1 + > tools/testing/selftests/kvm/lib/kvm_util.c | 7 ++++++- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h > index 2d7eb6989e83..d53a5f7cad61 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -133,6 +133,7 @@ void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl, > int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl, > void *arg); > void vm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); > +int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg); > void kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); > int _kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); > void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags); > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index e5fbf16f725b..b8849a1aca79 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -1697,11 +1697,16 @@ void vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) > { > int ret; > > - ret = ioctl(vm->fd, cmd, arg); > + ret = _vm_ioctl(vm, cmd, arg); > TEST_ASSERT(ret == 0, "vm ioctl %lu failed, rc: %i errno: %i (%s)", > cmd, ret, errno, strerror(errno)); > } > > +int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) > +{ > + return ioctl(vm->fd, cmd, arg); > +} > + > /* > * KVM system ioctl > * > -- > 2.29.2 > With the summary prefix change suggested by Paolo, or even better 'KVM: selftests:' since that's what the majority of patches in KVM selftests have Reviewed-by: Andrew Jones <drjones@redhat.com>
diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 2d7eb6989e83..d53a5f7cad61 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -133,6 +133,7 @@ void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl, int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl, void *arg); void vm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); +int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg); void kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); int _kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg); void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index e5fbf16f725b..b8849a1aca79 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1697,11 +1697,16 @@ void vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) { int ret; - ret = ioctl(vm->fd, cmd, arg); + ret = _vm_ioctl(vm, cmd, arg); TEST_ASSERT(ret == 0, "vm ioctl %lu failed, rc: %i errno: %i (%s)", cmd, ret, errno, strerror(errno)); } +int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) +{ + return ioctl(vm->fd, cmd, arg); +} + /* * KVM system ioctl *
As in kvm_ioctl and _kvm_ioctl, add the respective _vm_ioctl for vm_ioctl. _vm_ioctl invokes an ioctl using the vm fd, leaving the caller to test the result. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> --- tools/testing/selftests/kvm/include/kvm_util.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)