On Sun, 2020-11-15 at 13:14 +0800, kernel test robot wrote:
>
> All errors (new ones prefixed by >>):
>
> arch/x86/kvm/../../../virt/kvm/eventfd.c: In function
> 'irqfd_wakeup':
> >> arch/x86/kvm/../../../virt/kvm/eventfd.c:198:23: error: passing
> argument 1 of 'eventfd_ctx_do_read' from incompatible pointer type [-
> Werror=incompatible-pointer-types]
> 198 | eventfd_ctx_do_read(&irqfd->eventfd, &cnt);
> | ^~~~~~~~~~~~~~~
> | |
> | struct eventfd_ctx **
Hm, that ampersand isn't supposed to be there; it arrived when I moved
the 'drain events' part of the series after the exclusivity.
There was a new version of the patch, and I thought we'd discussed on
IRC that it wasn't worth resending in email and you'd fix it up on
applying?
Since this is still only in the queue and not yet in a permanent branch
you can still fix it up, right?
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 147adc862b95..e996989cd580 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -195,7 +195,7 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)
if (flags & EPOLLIN) {
u64 cnt;
- eventfd_ctx_do_read(&irqfd->eventfd, &cnt);
+ eventfd_ctx_do_read(irqfd->eventfd, &cnt);
idx = srcu_read_lock(&kvm->irq_srcu);
do {
Amazon Development Centre (London) Ltd. Registered in England and Wales with registration number 04543232 with its registered office at 1 Principal Place, Worship Street, London EC2A 2FA, United Kingdom.
