diff --git a/REUSE.toml b/REUSE.toml
index f1ae1ec..dafc565 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -208,12 +208,6 @@ SPDX-FileCopyrightText = 'Dominik Mierzejewski'
SPDX-License-Identifier = 'MIT'
[[annotations]]
-# https://lists.nongnu.org/archive/html/qemu-devel/2022-02/msg04587.html
-path = 'patches/qemu-for-aflplusplus-io_uring-2.2.patch'
-SPDX-FileCopyrightText = 'Haiyue Wang'
-SPDX-License-Identifier = 'LGPL-2.1-or-later'
-
-[[annotations]]
# https://lists.nongnu.org/archive/html/qemu-devel/2019-09/msg05403.html
path = 'patches/qemu-for-fuzzolic-test-opts-range-beyond.patch'
SPDX-FileCopyrightText = 'Andrey Shinkevich'
diff --git a/loftix/emulation.scm b/loftix/emulation.scm
index 8de6ba0..2257775 100644
--- a/loftix/emulation.scm
+++ b/loftix/emulation.scm
@@ -18,7 +18,7 @@
(define-public qemu-for-aflplusplus
(let ((base qemu-minimal)
(base-version "5.2.50")
- (commit "c43dd6e0369cd5d2a2458f3bd7f4f58c8de53300")
+ (commit "202a9182ef83e5ec8593b54b60eb06b53716671f")
(revision "master"))
(hidden-package
(package
@@ -35,9 +35,7 @@
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
- (base32 "1qhblmr3azmvzv15w4isxws8zm8jmxxmskmjhmwnn5899rr34p0g"))
- (patches (search-patches
- "patches/qemu-for-aflplusplus-io_uring-2.2.patch"))))
+ (base32 "0c6z7h35yh071l84sv3czcvsw3l4vbn50innsba1wbyqbac6j4dq"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:configure-flags _ #~'())
diff --git a/patches/qemu-for-aflplusplus-io_uring-2.2.patch b/patches/qemu-for-aflplusplus-io_uring-2.2.patch
deleted file mode 100644
index 3742dfa..0000000
--- a/patches/qemu-for-aflplusplus-io_uring-2.2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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 */
|
