72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
|
From ef3d2918827d6c5204af06e1597dc4dbde22414a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 17 Oct 2024 09:43:01 +0800
|
||
|
|
Subject: [PATCH] util/userfaultfd: Remove unused uffd_poll_events
|
||
|
|
|
||
|
|
chery-pick from ccf6b78275816c9dec84d3a40e9aa3b6ba6ebc06
|
||
|
|
|
||
|
|
uffd_poll_events has been unused since it was added; it's also
|
||
|
|
just a wrapper around a plain old poll call, so doesn't add anything.
|
||
|
|
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
|
||
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
||
|
|
Link: https://lore.kernel.org/r/20240919134626.166183-8-dave@treblig.org
|
||
|
|
Signed-off-by: Peter Xu <peterx@redhat.com>
|
||
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
include/qemu/userfaultfd.h | 1 -
|
||
|
|
util/userfaultfd.c | 28 ----------------------------
|
||
|
|
2 files changed, 29 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/qemu/userfaultfd.h b/include/qemu/userfaultfd.h
|
||
|
|
index 18a4314212..a1979308d7 100644
|
||
|
|
--- a/include/qemu/userfaultfd.h
|
||
|
|
+++ b/include/qemu/userfaultfd.h
|
||
|
|
@@ -39,7 +39,6 @@ int uffd_copy_page(int uffd_fd, void *dst_addr, void *src_addr,
|
||
|
|
int uffd_zero_page(int uffd_fd, void *addr, uint64_t length, bool dont_wake);
|
||
|
|
int uffd_wakeup(int uffd_fd, void *addr, uint64_t length);
|
||
|
|
int uffd_read_events(int uffd_fd, struct uffd_msg *msgs, int count);
|
||
|
|
-bool uffd_poll_events(int uffd_fd, int tmo);
|
||
|
|
|
||
|
|
#endif /* CONFIG_LINUX */
|
||
|
|
|
||
|
|
diff --git a/util/userfaultfd.c b/util/userfaultfd.c
|
||
|
|
index fdff4867e8..b7d320d0b1 100644
|
||
|
|
--- a/util/userfaultfd.c
|
||
|
|
+++ b/util/userfaultfd.c
|
||
|
|
@@ -356,31 +356,3 @@ int uffd_read_events(int uffd_fd, struct uffd_msg *msgs, int count)
|
||
|
|
|
||
|
|
return (int) (res / sizeof(struct uffd_msg));
|
||
|
|
}
|
||
|
|
-
|
||
|
|
-/**
|
||
|
|
- * uffd_poll_events: poll UFFD file descriptor for read
|
||
|
|
- *
|
||
|
|
- * Returns true if events are available for read, false otherwise
|
||
|
|
- *
|
||
|
|
- * @uffd_fd: UFFD file descriptor
|
||
|
|
- * @tmo: timeout value
|
||
|
|
- */
|
||
|
|
-bool uffd_poll_events(int uffd_fd, int tmo)
|
||
|
|
-{
|
||
|
|
- int res;
|
||
|
|
- struct pollfd poll_fd = { .fd = uffd_fd, .events = POLLIN, .revents = 0 };
|
||
|
|
-
|
||
|
|
- do {
|
||
|
|
- res = poll(&poll_fd, 1, tmo);
|
||
|
|
- } while (res < 0 && errno == EINTR);
|
||
|
|
-
|
||
|
|
- if (res == 0) {
|
||
|
|
- return false;
|
||
|
|
- }
|
||
|
|
- if (res < 0) {
|
||
|
|
- error_report("uffd_poll_events() failed: errno=%i", errno);
|
||
|
|
- return false;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- return (poll_fd.revents & POLLIN) != 0;
|
||
|
|
-}
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|