Re: [PATCH RFC 2/4] intc/s390_flic_kvm.c: Use kvm_device_ioctl() instead of ioctl()

[David Hildenbrand]

On 04.03.20 09:22, Christian Borntraeger wrote:
> 
> 
> On 03.03.20 15:19, David Hildenbrand wrote:
>> Let's use the official variant, which will e.g., trace the call.
>>
>> Cc: Cornelia Huck 
>> Cc: Halil Pasic 
>> Cc: Christian Borntraeger 
>> Cc: qemu-s3...@nongnu.org
>> Signed-off-by: David Hildenbrand 
>> ---
>>  hw/intc/s390_flic_kvm.c | 22 +++---
>>  1 file changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
>> index a306b26faa..5151582ba0 100644
>> --- a/hw/intc/s390_flic_kvm.c
>> +++ b/hw/intc/s390_flic_kvm.c
>> @@ -68,7 +68,7 @@ static int flic_get_all_irqs(KVMS390FLICState *flic,
>>  };
>>  int rc;
>>  
>> -rc = ioctl(flic->fd, KVM_GET_DEVICE_ATTR, &attr);
>> +rc = kvm_device_ioctl(flic->fd, KVM_GET_DEVICE_ATTR, &attr);
>>  
>>  return rc == -1 ? -errno : rc;
>>  }
>> @@ -80,7 +80,7 @@ static void flic_enable_pfault(KVMS390FLICState *flic)
>>  };
>>  int rc;
>>  
>> -rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>> +rc = kvm_device_ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>>  
>>  if (rc) {
>>  fprintf(stderr, "flic: couldn't enable pfault\n");
>> @@ -94,7 +94,7 @@ static void flic_disable_wait_pfault(KVMS390FLICState 
>> *flic)
>>  };
>>  int rc;
>>  
>> -rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>> +rc = kvm_device_ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>>  
>>  if (rc) {
>>  fprintf(stderr, "flic: couldn't disable pfault\n");
>> @@ -118,7 +118,7 @@ static int flic_enqueue_irqs(void *buf, uint64_t len,
>>  .attr = len,
>>  };
>>  
>> -rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>> +rc = kvm_device_ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>>  
>>  return rc ? -errno : 0;
> 
> This is no longer necessary as this is done by kvm_device_ioctl, no?
> 
> Same for other location.s
> 

Right, missed that. Thanks for pointing that out!

-- 
Thanks,

David / dhildenb

Re: [PATCH RFC 2/4] intc/s390_flic_kvm.c: Use kvm_device_ioctl() instead of ioctl()

[Christian Borntraeger]

On 03.03.20 15:19, David Hildenbrand wrote:
> Let's use the official variant, which will e.g., trace the call.
> 
> Cc: Cornelia Huck 
> Cc: Halil Pasic 
> Cc: Christian Borntraeger 
> Cc: qemu-s3...@nongnu.org
> Signed-off-by: David Hildenbrand 
> ---
>  hw/intc/s390_flic_kvm.c | 22 +++---
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
> index a306b26faa..5151582ba0 100644
> --- a/hw/intc/s390_flic_kvm.c
> +++ b/hw/intc/s390_flic_kvm.c
> @@ -68,7 +68,7 @@ static int flic_get_all_irqs(KVMS390FLICState *flic,
>  };
>  int rc;
>  
> -rc = ioctl(flic->fd, KVM_GET_DEVICE_ATTR, &attr);
> +rc = kvm_device_ioctl(flic->fd, KVM_GET_DEVICE_ATTR, &attr);
>  
>  return rc == -1 ? -errno : rc;
>  }
> @@ -80,7 +80,7 @@ static void flic_enable_pfault(KVMS390FLICState *flic)
>  };
>  int rc;
>  
> -rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
> +rc = kvm_device_ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>  
>  if (rc) {
>  fprintf(stderr, "flic: couldn't enable pfault\n");
> @@ -94,7 +94,7 @@ static void flic_disable_wait_pfault(KVMS390FLICState *flic)
>  };
>  int rc;
>  
> -rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
> +rc = kvm_device_ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>  
>  if (rc) {
>  fprintf(stderr, "flic: couldn't disable pfault\n");
> @@ -118,7 +118,7 @@ static int flic_enqueue_irqs(void *buf, uint64_t len,
>  .attr = len,
>  };
>  
> -rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
> +rc = kvm_device_ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
>  
>  return rc ? -errno : 0;

This is no longer necessary as this is done by kvm_device_ioctl, no?

Same for other location.s