Merge commit 'ca82180603446831187203383de4b5ede4e2c346' into upstream-merge

* commit 'ca82180603446831187203383de4b5ede4e2c346':
  kvm: add API to set ioeventfd
  tap: add interface to get device fd

Conflicts:
	kvm-all.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 22 insertions, 1 deletions

diff --git a/kvm-all.c b/kvm-all.c
index 608da0675..665f6716a 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1187,6 +1187,27 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset)
     return r;
 }
 
+#ifdef KVM_IOEVENTFD
+int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign)
+{
+    struct kvm_ioeventfd kick = {
+        .datamatch = val,
+        .addr = addr,
+        .len = 2,
+        .flags = KVM_IOEVENTFD_FLAG_DATAMATCH | KVM_IOEVENTFD_FLAG_PIO,
+        .fd = fd,
+    };
+    int r;
+    if (!kvm_enabled())
+        return -ENOSYS;
+    if (!assign)
+        kick.flags |= KVM_IOEVENTFD_FLAG_DEASSIGN;
+    r = kvm_vm_ioctl(kvm_state, KVM_IOEVENTFD, &kick);
+    if (r < 0)
+        return r;
+    return 0;
+}
+#endif
+
 #undef PAGE_SIZE
 #include "qemu-kvm.c"
-