KVM: Fixing coding style warnings and errors
Subsystems (2)
PATCH 1/1 KVM: Fixing coding style warnings and errors
Fixing checkpatch warnings and errors in KVM.
Signed-off-by Daniel Hejduk <[email protected]>
--- virt/kvm/eventfd.c | 21 +++++++++++---------- virt/kvm/guest_memfd.c | 1 + virt/kvm/irqchip.c | 10 ++++++---- virt/kvm/kvm_main.c | 41 +++++++++++++++++++++++------------------ virt/kvm/vfio.c | 1 + 5 files changed, 42 insertions(+), 32 deletions(-)
virt/kvm/eventfd.c +11 -10
@@ -32,7 +32,7 @@static struct workqueue_struct *irqfd_cleanup_wq; -bool __attribute__((weak)) +bool __weak kvm_arch_irqfd_allowed (struct kvm *kvm,struct kvm_irqfd *args) {return true;
@@ -179,7 +179,7 @@ irqfd_deactivate(struct kvm_kernel_irqfd *irqfd)queue_work (irqfd_cleanup_wq, &irqfd->shutdown); } -int __attribute__((weak)) kvm_arch_set_irq_inatomic( +int __weak kvm_arch_set_irq_inatomic( struct kvm_kernel_irq_routing_entry *irq, struct kvm *kvm, int irq_source_id, int level,
@@ -192,19 +192,20 @@ int __attribute__((weak)) kvm_arch_set_irq_inatomic(* Called with wqh->lock held and interrupts disabled */ static int -irqfd_wakeup (wait_queue_entry_t *wait,unsigned mode,int sync,void *key) +irqfd_wakeup (wait_queue_entry_t *wait,unsigned int mode,int sync,void *key) {struct kvm_kernel_irqfd *irqfd = container_of(wait, struct kvm_kernel_irqfd, wait);__poll_t flags =key_to_poll (key);struct kvm_kernel_irq_routing_entry irq;struct kvm *kvm = irqfd->kvm; -unsigned seq; +unsigned int seq;int idx;int ret =0 ;if (flags &EPOLLIN ) {u64 cnt; +eventfd_ctx_do_read (irqfd->eventfd, &cnt); idx =srcu_read_lock (&kvm->irq_srcu);
@@ -275,24 +276,24 @@ static void irqfd_update(struct kvm *kvm, struct kvm_kernel_irqfd *irqfd) }#ifdef CONFIG_HAVE_KVM_IRQ_BYPASS -void __attribute__((weak))kvm_arch_irq_bypass_stop ( +void __weak kvm_arch_irq_bypass_stop (struct irq_bypass_consumer *cons) { } -void __attribute__((weak))kvm_arch_irq_bypass_start ( +void __weak kvm_arch_irq_bypass_start (struct irq_bypass_consumer *cons) { } -int __attribute__((weak))kvm_arch_update_irqfd_routing ( +int __weak kvm_arch_update_irqfd_routing (struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set) {return 0 ; } -bool __attribute__((weak))kvm_arch_irqfd_route_changed ( +bool __weak kvm_arch_irqfd_route_changed (struct kvm_kernel_irq_routing_entry *old,struct kvm_kernel_irq_routing_entry *new) {
@@ -456,7 +457,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)return ret; } -bool kvm_irq_has_notifier (struct kvm *kvm,unsigned irqchip,unsigned pin) +bool kvm_irq_has_notifier (struct kvm *kvm,unsigned int irqchip,unsigned int pin) {struct kvm_irq_ack_notifier *kian;int gsi, idx;
@@ -487,7 +488,7 @@ void kvm_notify_acked_gsi(struct kvm *kvm, int gsi) kian->irq_acked (kian); } -void kvm_notify_acked_irq (struct kvm *kvm,unsigned irqchip,unsigned pin) +void kvm_notify_acked_irq (struct kvm *kvm,unsigned int irqchip,unsigned int pin) {int gsi, idx;
virt/kvm/guest_memfd.c +1 -0
@@ -32,6 +32,7 @@ static int __kvm_gmem_prepare_folio(struct kvm *kvm, struct kvm_memory_slot *slokvm_pfn_t pfn =folio_file_pfn (folio, index);gfn_t gfn = slot->base_gfn + index - slot->gmem.pgoff;int rc =kvm_arch_gmem_prepare (kvm, gfn, pfn,folio_order (folio)); +if (rc) {pr_warn_ratelimited ("gmem: Failed to prepare folio for index %lx GFN %llx PFN %llx error %d.\n" , index, gfn, pfn, rc);
virt/kvm/irqchip.c +6 -4
@@ -37,7 +37,7 @@ int kvm_irq_map_gsi(struct kvm *kvm,return n; } -int kvm_irq_map_chip_pin (struct kvm *kvm,unsigned irqchip,unsigned pin) +int kvm_irq_map_chip_pin (struct kvm *kvm,unsigned int irqchip,unsigned int pin) {struct kvm_irq_routing_table *irq_rt;
@@ -85,6 +85,7 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level,while (i--) {int r; + r = irq_set[i].set (&irq_set[i], kvm, irq_source_id, level, line_status);if (r <0 )
@@ -121,6 +122,7 @@ void kvm_free_irq_routing(struct kvm *kvm)/* Called only during vm destruction. Nobody can use the pointer at this stage */ struct kvm_irq_routing_table *rt =rcu_access_pointer (kvm->irq_routing); +free_irq_routing_table (rt); }
@@ -156,7 +158,7 @@ static int setup_routing_entry(struct kvm *kvm,return 0 ; } -void __attribute__((weak))kvm_arch_irq_routing_update (struct kvm *kvm) +void __weak kvm_arch_irq_routing_update (struct kvm *kvm) { }
@@ -167,8 +169,8 @@ bool __weak kvm_arch_can_set_irq_routing(struct kvm *kvm)int kvm_set_irq_routing (struct kvm *kvm,const struct kvm_irq_routing_entry *ue, -unsigned nr, -unsigned flags) +unsigned int nr, +unsigned int flags) {struct kvm_irq_routing_table *new, *old;struct kvm_kernel_irq_routing_entry *e;
virt/kvm/kvm_main.c +23 -18
173 lines not on this page · raw message
virt/kvm/vfio.c +1 -0
@@ -190,6 +190,7 @@ static int kvm_vfio_file_del(struct kvm_device *dev, unsigned int fd) {struct kvm_vfio *kv = dev->private;struct kvm_vfio_file *kvf; +CLASS (fd, f)(fd);int ret;
Signature · 1 line
2.43.0