On 26 September 2013 20:56, Christoffer Dall <christoffer.d...@linaro.org> wrote: > Introduces two simple functions: > int kvm_device_ioctl(int fd, int type, ...); > int kvm_create_device(KVMState *s, uint64_t type, bool test); > > These functions wrap the basic ioctl-based interactions with KVM in a > way similar to other KVM ioctl wrappers. > > Signed-off-by: Christoffer Dall <christoffer.d...@linaro.org> > --- a/trace-events > +++ b/trace-events > @@ -1163,6 +1163,7 @@ migrate_set_state(int new_state) "new state %d" > kvm_ioctl(int type, void *arg) "type %d, arg %p" > kvm_vm_ioctl(int type, void *arg) "type %d, arg %p" > kvm_vcpu_ioctl(int cpu_index, int type, void *arg) "cpu_index %d, type %d, > arg %p" > +kvm_device_ioctl(int fd, int type, void *arg) "dev fd %d, type %d, arg %p" > kvm_run_exit(int cpu_index, uint32_t reason) "cpu_index %d, reason %d"
Following commit 4fe6e9ec this will need rebasing to avoid the conflict, and you should also update the format string in line with that commit so it reads "dev fd %d, type 0x%x, arg %p". Other than that nit, Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> -- PMM
