[PATCH RFCv2 1/4] openpic_kvm: Use kvm_device_ioctl() instead of ioctl()

[David Hildenbrand]

Let's use the official variant, which will e.g., trace the call.

Cc: Markus Armbruster <address@hidden>
Cc: "Philippe Mathieu-Daudé" <address@hidden>
Cc: "Marc-André Lureau" <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
 hw/intc/openpic_kvm.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index e4bf47d885..a5aa0ce915 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -70,10 +70,10 @@ static void kvm_openpic_write(void *opaque, hwaddr addr, 
uint64_t val,
     attr.attr = addr;
     attr.addr = (uint64_t)(unsigned long)&val32;
 
-    ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr);
+    ret = kvm_device_ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr);
     if (ret < 0) {
         qemu_log_mask(LOG_UNIMP, "%s: %s %" PRIx64 "\n", __func__,
-                      strerror(errno), attr.attr);
+                      strerror(-ret), attr.attr);
     }
 }
 
@@ -96,10 +96,10 @@ static uint64_t kvm_openpic_read(void *opaque, hwaddr addr, 
unsigned size)
     attr.attr = addr;
     attr.addr = (uint64_t)(unsigned long)&val;
 
-    ret = ioctl(opp->fd, KVM_GET_DEVICE_ATTR, &attr);
+    ret = kvm_device_ioctl(opp->fd, KVM_GET_DEVICE_ATTR, &attr);
     if (ret < 0) {
         qemu_log_mask(LOG_UNIMP, "%s: %s %" PRIx64 "\n", __func__,
-                      strerror(errno), attr.attr);
+                      strerror(-ret), attr.attr);
         return 0;
     }
 
@@ -145,10 +145,10 @@ static void kvm_openpic_region_add(MemoryListener 
*listener,
     attr.attr = KVM_DEV_MPIC_BASE_ADDR;
     attr.addr = (uint64_t)(unsigned long)&reg_base;
 
-    ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr);
+    ret = kvm_device_ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr);
     if (ret < 0) {
         fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__,
-                strerror(errno), reg_base);
+                strerror(-ret), reg_base);
     }
 }
 
@@ -179,10 +179,10 @@ static void kvm_openpic_region_del(MemoryListener 
*listener,
     attr.attr = KVM_DEV_MPIC_BASE_ADDR;
     attr.addr = (uint64_t)(unsigned long)&reg_base;
 
-    ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr);
+    ret = kvm_device_ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr);
     if (ret < 0) {
         fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__,
-                strerror(errno), reg_base);
+                strerror(-ret), reg_base);
     }
 }
 
-- 
2.24.1