Update to newer API

- Fixed buffers are now available through io_uring_register()
- Various thread/wq options are now dead and automatic instead
- sqe->index is now sqe->buf_index
- Fixed buffers require flag, not separate opcode

Signed-off-by: Jens Axboe <axboe@kernel.dk>

2 files changed, 8 insertions, 7 deletions

diff --git a/test/io_uring-cp.c b/test/io_uring-cp.c
index 9d7c56c..0fbd1d3 100644
--- a/test/io_uring-cp.c
+++ b/test/io_uring-cp.c
@@ -23,16 +23,14 @@ struct io_data {
 	struct iovec *iov;
 };
 
-static int setup_context(unsigned entries, struct io_uring *ring, int offload)
+static int setup_context(unsigned entries, struct io_uring *ring)
 {
 	struct io_uring_params p;
 	int ret;
 
 	memset(&p, 0, sizeof(p));
-	if (offload)
-		p.flags = IORING_SETUP_SQWQ;
 
-	ret = io_uring_queue_init(entries, &p, NULL, 0, ring);
+	ret = io_uring_queue_init(entries, &p, ring);
 	if (ret < 0) {
 		fprintf(stderr, "queue_init: %s\n", strerror(-ret));
 		return -1;
@@ -79,6 +77,7 @@ static int queue_read(int fd, off_t size, off_t offset)
 	sqe->fd = fd;
 	sqe->off = offset;
 	sqe->addr = data->iov;
+	sqe->buf_index = 0;
 	sqe->data = (unsigned long) data;
 	iovecs[sqe_index(sqe)].iov_len = size;
 	sqe->len = 1;
@@ -128,6 +127,7 @@ static void queue_write(int fd, struct io_uring_cqe *cqe)
 	sqe->fd = fd;
 	sqe->off = data->offset;
 	sqe->addr = data->iov;
+	sqe->buf_index = 0;
 	sqe->data = 0;
 	data->iov->iov_len = cqe->res;
 	sqe->len = 1;
@@ -166,9 +166,9 @@ int main(int argc, char *argv[])
 		iovecs[i].iov_len = BS;
 	}
 
-	if (setup_context(QD, &in_ring, 1))
+	if (setup_context(QD, &in_ring))
 		return 1;
-	if (setup_context(QD, &out_ring, 0))
+	if (setup_context(QD, &out_ring))
 		return 1;
 	if (get_file_size(infd, &read_left))
 		return 1;
diff --git a/test/io_uring-test.c b/test/io_uring-test.c
index caf61ed..4bd0892 100644
--- a/test/io_uring-test.c
+++ b/test/io_uring-test.c
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
 	memset(&p, 0, sizeof(p));
 	p.flags = IORING_SETUP_IOPOLL;
 
-	ret = io_uring_queue_init(QD, &p, NULL, 0, &ring);
+	ret = io_uring_queue_init(QD, &p, &ring);
 	if (ret < 0) {
 		fprintf(stderr, "queue_init: %s\n", strerror(-ret));
 		return 1;
@@ -65,6 +65,7 @@ int main(int argc, char *argv[])
 		sqe->off = offset;
 		sqe->addr = &iovecs[i];
 		sqe->len = 1;
+		sqe->buf_index = 0;
 		offset += iovecs[i].iov_len;
 	} while (1);