7bb77ea74f
- Introduce the SM4 cipher algorithms (OSCCA GB/T 32907-2016).
- intel_iommu: Add missed sanity check for 256-bit invalidation queue
- linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default
- chardev/baum: Use definitions to avoid dynamic stack allocation
- ui/console: Get tab completion working again in the SDL monitor vc
- s390x/tcg: Fix opcode for lzrf
- virtiofsd: use g_date_time_get_microsecond to get subsecond
- ui/curses: Avoid dynamic stack allocation
- target/m68k: always call gen_exit_tb() after writes to SR
- target/m68k: Perform writback before modifying SR
- target/m68k: Fix MACSR to CCR
- target/m68k: Implement atomic test-and-set
- block/nvme: nvme_process_completion() fix bound for cid
- hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure
- target/ppc: Zero second doubleword of VSR registers for FPR insns
- target/ppc: Set OV32 when OV is set
- target/ppc: Zero second doubleword for VSX madd instructions
- target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
- hw/pci: Add parenthesis to PCI_BUILD_BDF macro
- intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL
- acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
- acpi: ged: Add macro for acpi sleep control register
- hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
- ui/vnc: fix handling of VNC_FEATURE_XVP
- s390/sclp: fix SCLP facility map
- docs/tools/qemu-img.rst: fix typo (sumarizes)
- chardev/char: fix qemu_chr_is_busy() check
- edu: fix DMA range upper bound check
- platform-bus: fix refcount leak
- hw/net/virtio-net: fix qemu set used ring flag even vhost started
- 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
- hw/core/ptimer: fix timer zero period condition for freq > 1GHz
- hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero
- tests/unit/test-vmstate: Avoid dynamic stack allocation
- hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation
- hw/i386/multiboot: Avoid dynamic stack allocation
- hw/ppc/spapr: Fix code style problems reported by checkpatch
- chardev/baum: Replace magic values by X_MAX / Y_MAX definitions
- hw/intc/xics: Avoid dynamic stack allocation
- hw/net/e1000e_core: Use definition to avoid dynamic stack allocation
- intel_iommu: Fix invalidation descriptor type field
- configs: Fix typo in the sh4-softmmu devices config file
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 9813ed21ec2499c50cb58ac5fb114a1641708eb2)
71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
From 9c262dccf8329c646f09ea53b6423a641abf7e80 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 17 Oct 2024 09:36:03 +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 6b74f92792..99831c052d 100644
|
|
--- a/include/qemu/userfaultfd.h
|
|
+++ b/include/qemu/userfaultfd.h
|
|
@@ -30,6 +30,5 @@ 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 /* USERFAULTFD_H */
|
|
diff --git a/util/userfaultfd.c b/util/userfaultfd.c
|
|
index f1cd6af2b1..50d9246287 100644
|
|
--- a/util/userfaultfd.c
|
|
+++ b/util/userfaultfd.c
|
|
@@ -315,31 +315,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
|
|
|