kvm: Clean up irqfd API
PATCH 1/1 kvm: Clean up irqfd API
No need to expose the fd-based interface, everyone will already be fine with the more handy EventNotifier variant. Rename the latter to clarify that we are still talking about irqfds here.
---
Alex, please update your vfio patch accordingly.
hw/virtio-pci.c | 4 ++-- kvm-all.c | 18 ++++-------------- kvm-stub.c | 14 ++------------ kvm.h | 6 ++---- 4 files changed, 10 insertions(+), 32 deletions(-)
hw/virtio-pci.c +2 -2
@@ -515,7 +515,7 @@ static int kvm_virtio_pci_vq_vector_use(VirtIOPCIProxy *proxy, } irqfd->users++; - ret =kvm_irqchip_add_irq_notifier (kvm_state, n, irqfd->virq); + ret =kvm_irqchip_add_irqfd_notifier (kvm_state, n, irqfd->virq);if (ret <0 ) {if (--irqfd->users ==0 ) {kvm_irqchip_release_virq (kvm_state, irqfd->virq);
@@ -536,7 +536,7 @@ static void kvm_virtio_pci_vq_vector_release(VirtIOPCIProxy *proxy,VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector];int ret; - ret =kvm_irqchip_remove_irq_notifier (kvm_state, n, irqfd->virq); + ret =kvm_irqchip_remove_irqfd_notifier (kvm_state, n, irqfd->virq);assert (ret ==0 );if (--irqfd->users ==0 ) {
kvm-all.c +4 -14
@@ -1162,24 +1162,14 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign) }#endif /* !KVM_CAP_IRQ_ROUTING */ -int kvm_irqchip_add_irqfd (KVMState *s,int fd,int virq) +int kvm_irqchip_add_irqfd_notifier (KVMState *s,EventNotifier *n,int virq) { -return kvm_irqchip_assign_irqfd (s, fd, virq, true); +return kvm_irqchip_assign_irqfd (s,event_notifier_get_fd (n), virq, true); } -int kvm_irqchip_add_irq_notifier (KVMState *s,EventNotifier *n,int virq) +int kvm_irqchip_remove_irqfd_notifier (KVMState *s,EventNotifier *n,int virq) { -return kvm_irqchip_add_irqfd (s,event_notifier_get_fd (n), virq); -} - -int kvm_irqchip_remove_irqfd (KVMState *s,int fd,int virq) -{ -return kvm_irqchip_assign_irqfd (s, fd, virq, false); -} - -int kvm_irqchip_remove_irq_notifier (KVMState *s,EventNotifier *n,int virq) -{ -return kvm_irqchip_remove_irqfd (s,event_notifier_get_fd (n), virq); +return kvm_irqchip_assign_irqfd (s,event_notifier_get_fd (n), virq, false); }static int kvm_irqchip_create (KVMState *s)
kvm-stub.c +2 -12
@@ -141,22 +141,12 @@ void kvm_irqchip_release_virq(KVMState *s, int virq) { } -int kvm_irqchip_add_irqfd (KVMState *s,int fd,int virq) +int kvm_irqchip_add_irqfd_notifier (KVMState *s,EventNotifier *n,int virq) {return -ENOSYS ; } -int kvm_irqchip_add_irq_notifier (KVMState *s,EventNotifier *n,int virq) -{ -return -ENOSYS ; -} - -int kvm_irqchip_remove_irqfd (KVMState *s,int fd,int virq) -{ -return -ENOSYS ; -} - -int kvm_irqchip_remove_irq_notifier (KVMState *s,EventNotifier *n,int virq) +int kvm_irqchip_remove_irqfd_notifier (KVMState *s,EventNotifier *n,int virq) {return -ENOSYS ; }
kvm.h +2 -4
@@ -272,8 +272,6 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign);int kvm_irqchip_add_msi_route (KVMState *s,MSIMessage msg);void kvm_irqchip_release_virq (KVMState *s,int virq); -int kvm_irqchip_add_irqfd (KVMState *s,int fd,int virq); -int kvm_irqchip_remove_irqfd (KVMState *s,int fd,int virq); -int kvm_irqchip_add_irq_notifier (KVMState *s,EventNotifier *n,int virq); -int kvm_irqchip_remove_irq_notifier (KVMState *s,EventNotifier *n,int virq); +int kvm_irqchip_add_irqfd_notifier (KVMState *s,EventNotifier *n,int virq); +int kvm_irqchip_remove_irqfd_notifier (KVMState *s,EventNotifier *n,int virq);#endif
Signature · 1 line
1.7.3.4
Quoted 8 lines · Jan Kiszka
No need to expose the fd-based interface, everyone will already be fine with the more handy EventNotifier variant. Rename the latter to clarify that we are still talking about irqfds here.
Signed-off-by Jan Kiszka <[email protected]>---
Alex, please update your vfio patch accordingly.
Sure, thanks for the heads up.
Quoted 106 lines
hw/virtio-pci.c | 4 ++-- kvm-all.c | 18 ++++-------------- kvm-stub.c | 14 ++------------ kvm.h | 6 ++---- 4 files changed, 10 insertions(+), 32 deletions(-)hw/virtio-pci.c +2
-2@@ -515,7 +515,7 @@ static int kvm_virtio_pci_vq_vector_use(VirtIOPCIProxy *proxy, } irqfd->users++; - ret =kvm_irqchip_add_irq_notifier (kvm_state, n, irqfd->virq); + ret =kvm_irqchip_add_irqfd_notifier (kvm_state, n, irqfd->virq);if (ret <0 ) {if (--irqfd->users ==0 ) {kvm_irqchip_release_virq (kvm_state, irqfd->virq);@@ -536,7 +536,7 @@ static void kvm_virtio_pci_vq_vector_release(VirtIOPCIProxy *proxy,VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector];int ret; - ret =kvm_irqchip_remove_irq_notifier (kvm_state, n, irqfd->virq); + ret =kvm_irqchip_remove_irqfd_notifier (kvm_state, n, irqfd->virq);assert (ret ==0 );if (--irqfd->users ==0 ) {kvm-all.c +4
-14@@ -1162,24 +1162,14 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign) }#endif /* !KVM_CAP_IRQ_ROUTING */ -int kvm_irqchip_add_irqfd (KVMState *s,int fd,int virq) +int kvm_irqchip_add_irqfd_notifier (KVMState *s,EventNotifier *n,int virq) { -return kvm_irqchip_assign_irqfd (s, fd, virq, true); +return kvm_irqchip_assign_irqfd (s,event_notifier_get_fd (n), virq, true); } -int kvm_irqchip_add_irq_notifier (KVMState *s,EventNotifier *n,int virq) +int kvm_irqchip_remove_irqfd_notifier (KVMState *s,EventNotifier *n,int virq) { -return kvm_irqchip_add_irqfd (s,event_notifier_get_fd (n), virq); -} - -int kvm_irqchip_remove_irqfd (KVMState *s,int fd,int virq) -{ -return kvm_irqchip_assign_irqfd (s, fd, virq, false); -} - -int kvm_irqchip_remove_irq_notifier (KVMState *s,EventNotifier *n,int virq) -{ -return kvm_irqchip_remove_irqfd (s,event_notifier_get_fd (n), virq); +return kvm_irqchip_assign_irqfd (s,event_notifier_get_fd (n), virq, false); }static int kvm_irqchip_create (KVMState *s)kvm-stub.c +2
-12@@ -141,22 +141,12 @@ void kvm_irqchip_release_virq(KVMState *s, int virq) { } -int kvm_irqchip_add_irqfd (KVMState *s,int fd,int virq) +int kvm_irqchip_add_irqfd_notifier (KVMState *s,EventNotifier *n,int virq) {return -ENOSYS ; } -int kvm_irqchip_add_irq_notifier (KVMState *s,EventNotifier *n,int virq) -{ -return -ENOSYS ; -} - -int kvm_irqchip_remove_irqfd (KVMState *s,int fd,int virq) -{ -return -ENOSYS ; -} - -int kvm_irqchip_remove_irq_notifier (KVMState *s,EventNotifier *n,int virq) +int kvm_irqchip_remove_irqfd_notifier (KVMState *s,EventNotifier *n,int virq) {return -ENOSYS ; }kvm.h +2
-4@@ -272,8 +272,6 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign);int kvm_irqchip_add_msi_route (KVMState *s,MSIMessage msg);void kvm_irqchip_release_virq (KVMState *s,int virq); -int kvm_irqchip_add_irqfd (KVMState *s,int fd,int virq); -int kvm_irqchip_remove_irqfd (KVMState *s,int fd,int virq); -int kvm_irqchip_add_irq_notifier (KVMState *s,EventNotifier *n,int virq); -int kvm_irqchip_remove_irq_notifier (KVMState *s,EventNotifier *n,int virq); +int kvm_irqchip_add_irqfd_notifier (KVMState *s,EventNotifier *n,int virq); +int kvm_irqchip_remove_irqfd_notifier (KVMState *s,EventNotifier *n,int virq);#endif
Avi Kivity
AppliedQuoted 3 lines · Jan Kiszka
No need to expose the fd-based interface, everyone will already be fine with the more handy EventNotifier variant. Rename the latter to clarify that we are still talking about irqfds here.
Thanks, applied.
kvm.h int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign); · line 277
Quoted 8 lines
kvm.h +2
-4-int kvm_irqchip_add_irqfd (KVMState *s,int fd,int virq); -int kvm_irqchip_remove_irqfd (KVMState *s,int fd,int virq); -int kvm_irqchip_add_irq_notifier (KVMState *s,EventNotifier *n,int virq); -int kvm_irqchip_remove_irq_notifier (KVMState *s,EventNotifier *n,int virq); +int kvm_irqchip_add_irqfd_notifier (KVMState *s,EventNotifier *n,int virq); +int kvm_irqchip_remove_irqfd_notifier (KVMState *s,EventNotifier *n,int virq);#endif
Those names aren't particularly satisfying. add_irqfd_notifier implies you want to be notified about irqfd events, but that's not what the function does. Not sure what a good name would be.
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 8 lines · Avi Kivity
Quoted 3 lines · Jan Kiszka
No need to expose the fd-based interface, everyone will already be fine with the more handy EventNotifier variant. Rename the latter to clarify that we are still talking about irqfds here.
Thanks, applied.
Quoted 1 line
Quoted 11 lines
kvm.h int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign); · line 277
Quoted 7 lines
kvm.h +2
-4-int kvm_irqchip_add_irqfd (KVMState *s,int fd,int virq); -int kvm_irqchip_remove_irqfd (KVMState *s,int fd,int virq); -int kvm_irqchip_add_irq_notifier (KVMState *s,EventNotifier *n,int virq); -int kvm_irqchip_remove_irq_notifier (KVMState *s,EventNotifier *n,int virq); +int kvm_irqchip_add_irqfd_notifier (KVMState *s,EventNotifier *n,int virq); +int kvm_irqchip_remove_irqfd_notifier (KVMState *s,EventNotifier *n,int virq);#endif Those names aren't particularly satisfying.
add_irqfd_notifierimplies you want to be notified about irqfd events, but that's not what the function does. Not sure what a good name would be.
Now that there are no more variants, we could also drop the "notifier" from the name again. Better?
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE Corporate Competence Center Embedded Linux