Skip to content

Commit 9aca52b

Browse files
committed
Merge tag 'kvm-x86-generic-6.19' of https://github.com/kvm-x86/linux into HEAD
KVM generic changes for 6.19: - Use the recently-added WQ_PERCPU when creating the per-CPU workqueue for irqfd cleanup. - Fix a goof in the dirty ring documentation.
2 parents 32bd348 + 04fd067 commit 9aca52b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/virt/kvm/api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8524,7 +8524,7 @@ Therefore, the ioctl must be called *before* reading the content of
85248524
the dirty pages.
85258525

85268526
The dirty ring can get full. When it happens, the KVM_RUN of the
8527-
vcpu will return with exit reason KVM_EXIT_DIRTY_LOG_FULL.
8527+
vcpu will return with exit reason KVM_EXIT_DIRTY_RING_FULL.
85288528

85298529
The dirty ring interface has a major difference comparing to the
85308530
KVM_GET_DIRTY_LOG interface in that, when reading the dirty ring from

virt/kvm/eventfd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ bool kvm_notify_irqfd_resampler(struct kvm *kvm,
707707
*/
708708
int kvm_irqfd_init(void)
709709
{
710-
irqfd_cleanup_wq = alloc_workqueue("kvm-irqfd-cleanup", 0, 0);
710+
irqfd_cleanup_wq = alloc_workqueue("kvm-irqfd-cleanup", WQ_PERCPU, 0);
711711
if (!irqfd_cleanup_wq)
712712
return -ENOMEM;
713713

0 commit comments

Comments
 (0)