Dear all, in my opinion the `type` argument in the kvm ioctl wrappers should be of type unsigned. Please correct me if I am wrong.
- Due to the same reason as explained in the comment on the `irq_set_ioctl` field in `struct KVMState` (accel/kvm/kvm-all.c), the kvm ioctl wrapper should take `type` as an unsigned. Signed-off-by: johannst <johannes.sto...@gmail.com> --- accel/kvm/kvm-all.c | 8 ++++---- accel/kvm/trace-events | 8 ++++---- include/sysemu/kvm.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 0125c17edb..45cd6edce3 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2967,7 +2967,7 @@ int kvm_cpu_exec(CPUState *cpu) return ret; } -int kvm_ioctl(KVMState *s, int type, ...) +int kvm_ioctl(KVMState *s, unsigned type, ...) { int ret; void *arg; @@ -2985,7 +2985,7 @@ int kvm_ioctl(KVMState *s, int type, ...) return ret; } -int kvm_vm_ioctl(KVMState *s, int type, ...) +int kvm_vm_ioctl(KVMState *s, unsigned type, ...) { int ret; void *arg; @@ -3003,7 +3003,7 @@ int kvm_vm_ioctl(KVMState *s, int type, ...) return ret; } -int kvm_vcpu_ioctl(CPUState *cpu, int type, ...) +int kvm_vcpu_ioctl(CPUState *cpu, unsigned type, ...) { int ret; void *arg; @@ -3021,7 +3021,7 @@ int kvm_vcpu_ioctl(CPUState *cpu, int type, ...) return ret; } -int kvm_device_ioctl(int fd, int type, ...) +int kvm_device_ioctl(int fd, unsigned type, ...) { int ret; void *arg; diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events index 399aaeb0ec..d78c2eff31 100644 --- a/accel/kvm/trace-events +++ b/accel/kvm/trace-events @@ -1,11 +1,11 @@ # See docs/devel/tracing.rst for syntax documentation. # kvm-all.c -kvm_ioctl(int type, void *arg) "type 0x%x, arg %p" -kvm_vm_ioctl(int type, void *arg) "type 0x%x, arg %p" -kvm_vcpu_ioctl(int cpu_index, int type, void *arg) "cpu_index %d, type 0x%x, arg %p" +kvm_ioctl(unsigned type, void *arg) "type 0x%x, arg %p" +kvm_vm_ioctl(unsigned type, void *arg) "type 0x%x, arg %p" +kvm_vcpu_ioctl(int cpu_index, unsigned type, void *arg) "cpu_index %d, type 0x%x, arg %p" kvm_run_exit(int cpu_index, uint32_t reason) "cpu_index %d, reason %d" -kvm_device_ioctl(int fd, int type, void *arg) "dev fd %d, type 0x%x, arg %p" +kvm_device_ioctl(int fd, unsigned type, void *arg) "dev fd %d, type 0x%x, arg %p" kvm_failed_reg_get(uint64_t id, const char *msg) "Warning: Unable to retrieve ONEREG %" PRIu64 " from KVM: %s" kvm_failed_reg_set(uint64_t id, const char *msg) "Warning: Unable to set ONEREG %" PRIu64 " to KVM: %s" kvm_init_vcpu(int cpu_index, unsigned long arch_cpu_id) "index: %d id: %lu" diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index a1ab1ee12d..6d6ed4acf9 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -251,11 +251,11 @@ int kvm_on_sigbus(int code, void *addr); /* internal API */ -int kvm_ioctl(KVMState *s, int type, ...); +int kvm_ioctl(KVMState *s, unsigned type, ...); -int kvm_vm_ioctl(KVMState *s, int type, ...); +int kvm_vm_ioctl(KVMState *s, unsigned type, ...); -int kvm_vcpu_ioctl(CPUState *cpu, int type, ...); +int kvm_vcpu_ioctl(CPUState *cpu, unsigned type, ...); /** * kvm_device_ioctl - call an ioctl on a kvm device @@ -264,7 +264,7 @@ int kvm_vcpu_ioctl(CPUState *cpu, int type, ...); * * Returns: -errno on error, nonnegative on success */ -int kvm_device_ioctl(int fd, int type, ...); +int kvm_device_ioctl(int fd, unsigned type, ...); /** * kvm_vm_check_attr - check for existence of a specific vm attribute -- 2.32.0