drop use of __u* types (#438)

As we are now pure userspace, there is no need for us to use non-standard
integer types. This leaves the copied defines from Linux's vfio.h alone,
however.

Signed-off-by: John Levon <john.levon@nutanix.com>
Reviewed-by: Thanos Makatos <thanos.makatos@nutanix.com>

3 files changed, 22 insertions, 19 deletions

diff --git a/samples/client.c b/samples/client.c
index ea0c73e..b2008fd 100644
--- a/samples/client.c
+++ b/samples/client.c
@@ -734,7 +734,7 @@ do_migrate(int sock, int migr_reg_index, size_t nr_iters,
            struct iovec *migr_iter)
 {
     int ret;
-    __u64 pending_bytes, data_offset, data_size;
+    uint64_t pending_bytes, data_offset, data_size;
     size_t i = 0;
 
     assert(nr_iters > 0);
@@ -843,7 +843,7 @@ static size_t
 migrate_from(int sock, int migr_reg_index, size_t *nr_iters,
              struct iovec **migr_iters, unsigned char *md5sum, size_t bar1_size)
 {
-    __u32 device_state;
+    uint32_t device_state;
     int ret;
     size_t _nr_iters;
     pthread_t thread;
@@ -930,8 +930,8 @@ migrate_to(char *old_sock_path, int *server_max_fds,
     int ret, sock;
     char *sock_path;
     struct stat sb;
-    __u32 device_state = VFIO_DEVICE_STATE_RESUMING;
-    __u64 data_offset, data_len;
+    uint32_t device_state = VFIO_DEVICE_STATE_RESUMING;
+    uint64_t data_offset, data_len;
     size_t i;
 	MD5_CTX md5_ctx;
     char buf[bar1_size];
@@ -1008,7 +1008,7 @@ migrate_to(char *old_sock_path, int *server_max_fds,
          * TODO write half of migration data via regular write and other half via
          * memopy map.
          */
-        printf("client: writing migration device data %#llx-%#llx\n",
+        printf("client: writing migration device data %#lx-%#lx\n",
                data_offset, data_offset + migr_iters[i].iov_len - 1);
         ret = access_region(sock, migr_reg_index, true,
                             data_offset, migr_iters[i].iov_base,
diff --git a/samples/gpio-pci-idio-16.c b/samples/gpio-pci-idio-16.c
index 6c4206f..86ea083 100644
--- a/samples/gpio-pci-idio-16.c
+++ b/samples/gpio-pci-idio-16.c
@@ -78,7 +78,7 @@ migration_device_state_transition(vfu_ctx_t *vfu_ctx, vfu_migr_state_t state)
     return 0;
 }
 
-static __u64
+static uint64_t
 migration_get_pending_bytes(UNUSED vfu_ctx_t *vfu_ctx)
 {
     if (dirty) {
@@ -88,7 +88,8 @@ migration_get_pending_bytes(UNUSED vfu_ctx_t *vfu_ctx)
 }
 
 static int
-migration_prepare_data(UNUSED vfu_ctx_t *vfu_ctx, __u64 *offset, __u64 *size)
+migration_prepare_data(UNUSED vfu_ctx_t *vfu_ctx,
+                       uint64_t *offset, uint64_t *size)
 {
     *offset = 0;
     if (size != NULL) { /* null means resuming */
@@ -98,8 +99,8 @@ migration_prepare_data(UNUSED vfu_ctx_t *vfu_ctx, __u64 *offset, __u64 *size)
 }
 
 static ssize_t
-migration_read_data(UNUSED vfu_ctx_t *vfu_ctx, void *buf, __u64 size,
-                    __u64 offset)
+migration_read_data(UNUSED vfu_ctx_t *vfu_ctx, void *buf,
+                    uint64_t size, uint64_t offset)
 {
     assert(offset == 0);
     assert(size == sizeof(pin));
@@ -109,15 +110,15 @@ migration_read_data(UNUSED vfu_ctx_t *vfu_ctx, void *buf, __u64 size,
 }
 
 static int
-migration_data_written(UNUSED vfu_ctx_t *vfu_ctx, __u64 count)
+migration_data_written(UNUSED vfu_ctx_t *vfu_ctx, uint64_t count)
 {
     assert(count == sizeof(pin));
     return 0;
 }
 
 static ssize_t
-migration_write_data(UNUSED vfu_ctx_t *vfu_ctx, void *buf, __u64 size,
-                     __u64 offset)
+migration_write_data(UNUSED vfu_ctx_t *vfu_ctx, void *buf,
+                     uint64_t size, uint64_t offset)
 {
     assert(offset == 0);
     assert(size == sizeof(pin));
diff --git a/samples/server.c b/samples/server.c
index a449bb6..1ab184e 100644
--- a/samples/server.c
+++ b/samples/server.c
@@ -61,7 +61,7 @@ struct server_data {
     size_t bar1_size;
     struct dma_regions regions[NR_DMA_REGIONS];
     struct {
-        __u64 pending_bytes;
+        uint64_t pending_bytes;
         vfu_migr_state_t state;
     } migration;
 };
@@ -296,7 +296,7 @@ migration_device_state_transition(vfu_ctx_t *vfu_ctx, vfu_migr_state_t state)
     return 0;
 }
 
-static __u64
+static uint64_t
 migration_get_pending_bytes(vfu_ctx_t *vfu_ctx)
 {
     struct server_data *server_data = vfu_get_private(vfu_ctx);
@@ -304,7 +304,7 @@ migration_get_pending_bytes(vfu_ctx_t *vfu_ctx)
 }
 
 static int
-migration_prepare_data(vfu_ctx_t *vfu_ctx, __u64 *offset, __u64 *size)
+migration_prepare_data(vfu_ctx_t *vfu_ctx, uint64_t *offset, uint64_t *size)
 {
     struct server_data *server_data = vfu_get_private(vfu_ctx);
 
@@ -316,7 +316,8 @@ migration_prepare_data(vfu_ctx_t *vfu_ctx, __u64 *offset, __u64 *size)
 }
 
 static ssize_t
-migration_read_data(vfu_ctx_t *vfu_ctx, void *buf, __u64 size, __u64 offset)
+migration_read_data(vfu_ctx_t *vfu_ctx, void *buf,
+                    uint64_t size, uint64_t offset)
 {
     struct server_data *server_data = vfu_get_private(vfu_ctx);
 
@@ -354,7 +355,8 @@ migration_read_data(vfu_ctx_t *vfu_ctx, void *buf, __u64 size, __u64 offset)
 }
 
 static ssize_t
-migration_write_data(vfu_ctx_t *vfu_ctx, void *data, __u64 size, __u64 offset)
+migration_write_data(vfu_ctx_t *vfu_ctx, void *data,
+                     uint64_t size, uint64_t offset)
 {
     struct server_data *server_data = vfu_get_private(vfu_ctx);
     char *buf = data;
@@ -364,7 +366,7 @@ migration_write_data(vfu_ctx_t *vfu_ctx, void *data, __u64 size, __u64 offset)
     assert(data != NULL);
 
     if (offset != 0 || size < server_data->bar1_size) {
-        vfu_log(vfu_ctx, LOG_DEBUG, "XXX bad migration data write %#llx-%#llx",
+        vfu_log(vfu_ctx, LOG_DEBUG, "XXX bad migration data write %#lx-%#lx",
                 offset, offset + size - 1);
         errno = EINVAL;
         return -1;
@@ -389,7 +391,7 @@ migration_write_data(vfu_ctx_t *vfu_ctx, void *data, __u64 size, __u64 offset)
 
 
 static int
-migration_data_written(UNUSED vfu_ctx_t *vfu_ctx, UNUSED __u64 count)
+migration_data_written(UNUSED vfu_ctx_t *vfu_ctx, UNUSED uint64_t count)
 {
     /*
      * We apply migration state directly in the migration_write_data callback,