Commit 9aca52b5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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.
parents 32bd348b 04fd067b

Documentation/virt/kvm/api.rst

+1 −1
Original line number Diff line number Diff line
@@ -8524,7 +8524,7 @@ Therefore, the ioctl must be called *before* reading the content of 
the dirty pages.



The dirty ring can get full.  When it happens, the KVM_RUN of the

vcpu will return with exit reason KVM_EXIT_DIRTY_LOG_FULL.

vcpu will return with exit reason KVM_EXIT_DIRTY_RING_FULL.



The dirty ring interface has a major difference comparing to the

KVM_GET_DIRTY_LOG interface in that, when reading the dirty ring from

virt/kvm/eventfd.c

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ bool kvm_notify_irqfd_resampler(struct kvm *kvm, 
 */

int kvm_irqfd_init(void)

{

	irqfd_cleanup_wq = alloc_workqueue("kvm-irqfd-cleanup", 0, 0);

	irqfd_cleanup_wq = alloc_workqueue("kvm-irqfd-cleanup", WQ_PERCPU, 0);

	if (!irqfd_cleanup_wq)

		return -ENOMEM;