qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Haiyue Wang <haiyue.wang@intel.com>
To: qemu-devel@nongnu.org
Cc: Haiyue Wang <haiyue.wang@intel.com>, Fam Zheng <fam@euphon.net>,
	"open list:Block I/O path" <qemu-block@nongnu.org>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH v1] aio-posix: fix build failure io_uring 2.2
Date: Fri, 18 Feb 2022 00:16:27 +0800	[thread overview]
Message-ID: <20220217161627.45351-1-haiyue.wang@intel.com> (raw)

The io_uring fixed "Don't truncate addr fields to 32-bit on 32-bit":
https://git.kernel.dk/cgit/liburing/commit/?id=d84c29b19ed0b130000619cff40141bb1fc3615b

This leads to build failure:
../util/fdmon-io_uring.c: In function ‘add_poll_remove_sqe’:
../util/fdmon-io_uring.c:182:36: error: passing argument 2 of ‘io_uring_prep_poll_remove’ makes integer from pointer without a cast [-Werror=int-conversion]
  182 |     io_uring_prep_poll_remove(sqe, node);
      |                                    ^~~~
      |                                    |
      |                                    AioHandler *
In file included from /root/io/qemu/include/block/aio.h:18,
                 from ../util/aio-posix.h:20,
                 from ../util/fdmon-io_uring.c:49:
/usr/include/liburing.h:415:17: note: expected ‘__u64’ {aka ‘long long unsigned int’} but argument is of type ‘AioHandler *’
  415 |           __u64 user_data)
      |           ~~~~~~^~~~~~~~~
cc1: all warnings being treated as errors

So convert the paramter to right type according to the io_uring define.

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
 util/fdmon-io_uring.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/util/fdmon-io_uring.c b/util/fdmon-io_uring.c
index 1461dfa407..e7febbf11f 100644
--- a/util/fdmon-io_uring.c
+++ b/util/fdmon-io_uring.c
@@ -179,7 +179,11 @@ static void add_poll_remove_sqe(AioContext *ctx, AioHandler *node)
 {
     struct io_uring_sqe *sqe = get_sqe(ctx);
 
+#ifdef LIBURING_HAVE_DATA64
+    io_uring_prep_poll_remove(sqe, (__u64)node);
+#else
     io_uring_prep_poll_remove(sqe, node);
+#endif
 }
 
 /* Add a timeout that self-cancels when another cqe becomes ready */
-- 
2.35.1



             reply	other threads:[~2022-02-17 16:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-17 16:16 Haiyue Wang [this message]
2022-02-21 14:54 ` [PATCH v1] aio-posix: fix build failure io_uring 2.2 Stefan Hajnoczi
2022-02-21 15:54   ` Peter Maydell
2022-02-21 16:59     ` Wang, Haiyue
2022-02-22  8:46     ` Stefan Hajnoczi
2022-02-21 16:43   ` Wang, Haiyue
2022-02-22  8:46     ` Stefan Hajnoczi
2022-02-21 16:24 ` [PATCH v2] " Haiyue Wang
2022-02-22  9:02   ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220217161627.45351-1-haiyue.wang@intel.com \
    --to=haiyue.wang@intel.com \
    --cc=fam@euphon.net \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).