Fix build for QEMU for AFL++

References: https://lists.gnu.org/archive/html/qemu-devel/2022-02/msg04587.html

2 files changed, 52 insertions, 2 deletions

diff --git a/loftix/emulation.scm b/loftix/emulation.scm
index e649bc5..87df739 100644
--- a/loftix/emulation.scm
+++ b/loftix/emulation.scm
@@ -35,7 +35,9 @@
                               (recursive? #t)))
           (file-name (git-file-name name version))
           (sha256
-           (base32 "1qhblmr3azmvzv15w4isxws8zm8jmxxmskmjhmwnn5899rr34p0g"))))
+           (base32 "1qhblmr3azmvzv15w4isxws8zm8jmxxmskmjhmwnn5899rr34p0g"))
+          (patches (search-patches
+                    "patches/qemu-for-aflplusplus-io_uring-2.2.patch"))))
        (arguments
         (substitute-keyword-arguments (package-arguments base)
           ((#:configure-flags _ #~'())
@@ -57,7 +59,7 @@
                (delete 'fix-optionrom-makefile)
                (delete 'disable-unusable-tests)
                (replace 'configure
-                 (lambda* (#:key inputs outputs configure-flags
+                 (lambda* (#:key outputs configure-flags
                            #:allow-other-keys)
                    ;; The `configure' script doesn't understand some of the
                    ;; GNU options.  Thus, add a new phase that's compatible.
diff --git a/patches/qemu-for-aflplusplus-io_uring-2.2.patch b/patches/qemu-for-aflplusplus-io_uring-2.2.patch
new file mode 100644
index 0000000..3742dfa
--- /dev/null
+++ b/patches/qemu-for-aflplusplus-io_uring-2.2.patch
@@ -0,0 +1,48 @@
+commit 8a947c7a586e16a048894e1a0a73d154435e90ef
+Author: Haiyue Wang <haiyue.wang@intel.com>
+Date:   2022-02-22 00:24:01 +0800
+
+    aio-posix: fix build failure io_uring 2.2
+    
+    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
+    
+    Use LIBURING_HAVE_DATA64 to check whether the io_uring supports 64-bit
+    variants of the get/set userdata, to convert the paramter to the right
+    data type.
+    
+    Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
+    Message-Id: <20220221162401.45415-1-haiyue.wang@intel.com>
+    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+
+diff --git a/util/fdmon-io_uring.c b/util/fdmon-io_uring.c
+index 1461dfa40743..ab43052dd7a8 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)(uintptr_t)node);
++#else
+     io_uring_prep_poll_remove(sqe, node);
++#endif
+ }
+ 
+ /* Add a timeout that self-cancels when another cqe becomes ready */