From b0cba8d875a19e1c086ca93844d68ff42f0b0a54 Mon Sep 17 00:00:00 2001 From: John Levon Date: Tue, 13 Apr 2021 14:19:57 +0100 Subject: 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 Reviewed-by: Thanos Makatos --- samples/client.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'samples/client.c') 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, -- cgit v1.1