lkml.org 
[lkml]   [2022]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 4/5] KVM: irqfd: Rename resampler->notifier
Date
Since resampler irqfd is now using a mask notifier along with an ack
notifier, rename resampler->notifier to resampler->ack_notifier for
clarity.

Signed-off-by: Dmytro Maluka <dmy@semihalf.com>
---
include/linux/kvm_irqfd.h | 2 +-
virt/kvm/eventfd.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h
index 01754a1abb9e..4df9e6bbd7db 100644
--- a/include/linux/kvm_irqfd.h
+++ b/include/linux/kvm_irqfd.h
@@ -37,7 +37,7 @@ struct kvm_kernel_irqfd_resampler {
* RCU list modified under kvm->irqfds.resampler_lock
*/
struct list_head list;
- struct kvm_irq_ack_notifier notifier;
+ struct kvm_irq_ack_notifier ack_notifier;
struct kvm_irq_mask_notifier mask_notifier;
bool masked;
bool pending;
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index f98dcce3959c..72de942dbb9c 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -70,11 +70,11 @@ irqfd_resampler_ack(struct kvm_irq_ack_notifier *kian)
bool notify = true;

resampler = container_of(kian,
- struct kvm_kernel_irqfd_resampler, notifier);
+ struct kvm_kernel_irqfd_resampler, ack_notifier);
kvm = resampler->kvm;

kvm_set_irq(kvm, KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID,
- resampler->notifier.gsi, 0, false);
+ resampler->ack_notifier.gsi, 0, false);

spin_lock(&resampler->lock);
if (resampler->masked) {
@@ -137,11 +137,11 @@ irqfd_resampler_shutdown(struct kvm_kernel_irqfd *irqfd)

if (list_empty(&resampler->list)) {
list_del(&resampler->link);
- kvm_unregister_irq_ack_notifier(kvm, &resampler->notifier);
+ kvm_unregister_irq_ack_notifier(kvm, &resampler->ack_notifier);
kvm_unregister_irq_mask_notifier(kvm, resampler->mask_notifier.irq,
&resampler->mask_notifier);
kvm_set_irq(kvm, KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID,
- resampler->notifier.gsi, 0, false);
+ resampler->ack_notifier.gsi, 0, false);
kfree(resampler);
}

@@ -390,7 +390,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)

list_for_each_entry(resampler,
&kvm->irqfds.resampler_list, link) {
- if (resampler->notifier.gsi == irqfd->gsi) {
+ if (resampler->ack_notifier.gsi == irqfd->gsi) {
irqfd->resampler = resampler;
break;
}
@@ -407,8 +407,8 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)

resampler->kvm = kvm;
INIT_LIST_HEAD(&resampler->list);
- resampler->notifier.gsi = irqfd->gsi;
- resampler->notifier.irq_acked = irqfd_resampler_ack;
+ resampler->ack_notifier.gsi = irqfd->gsi;
+ resampler->ack_notifier.irq_acked = irqfd_resampler_ack;
resampler->mask_notifier.func = irqfd_resampler_mask_notify;
spin_lock_init(&resampler->lock);
INIT_LIST_HEAD(&resampler->link);
@@ -417,7 +417,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
kvm_register_and_fire_irq_mask_notifier(kvm, irqfd->gsi,
&resampler->mask_notifier);
kvm_register_irq_ack_notifier(kvm,
- &resampler->notifier);
+ &resampler->ack_notifier);
irqfd->resampler = resampler;
}

--
2.37.1.559.g78731f0fdb-goog
\
 
 \ /
  Last update: 2022-08-05 21:41    [W:0.153 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site