7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - hw/net/can/sja1000: fix bug for single acceptance filter and standard frame - tests/avocado: fix typo in replay_linux - util/userfaultfd: Remove unused uffd_poll_events - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
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
|
|
|