Patchwork [v5,3/5] RESEND: function for assigning ioeventfds.

login
register
mail settings
Submitter Cam Macdonell
Date April 21, 2010, 7:15 p.m.
Message ID <1271877347-24981-1-git-send-email-cam@cs.ualberta.ca>
Download mbox | patch
Permalink /patch/50672/
State New
Headers show

Comments

Cam Macdonell - April 21, 2010, 7:15 p.m.
Apologies, I wasn't on the latest KVM HEAD and so missed that Michael had added
an irqfd assignment function (and a more correct one at that).  So now this
patch has just one function.

---
 kvm-all.c |   26 ++++++++++++++++++++++++++
 kvm.h     |    7 +++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

Patch

diff --git a/kvm-all.c b/kvm-all.c
index c0d27db..df8e398 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1193,6 +1193,32 @@  int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset)
 }
 
 #ifdef KVM_IOEVENTFD
+int kvm_set_ioeventfd_mmio_long(int fd, uint32_t addr, uint32_t val, bool assign)
+{
+
+    int ret;
+    struct kvm_ioeventfd iofd;
+
+    iofd.datamatch = val;
+    iofd.addr = addr;
+    iofd.len = 4;
+    iofd.flags = KVM_IOEVENTFD_FLAG_DATAMATCH;
+    iofd.fd = fd;
+
+    if (!kvm_enabled())
+        return -ENOSYS;
+    if (!assign)
+        iofd.flags |= KVM_IOEVENTFD_FLAG_DEASSIGN;
+
+    ret = kvm_vm_ioctl(kvm_state, KVM_IOEVENTFD, &iofd);
+
+    if (ret < 0) {
+        return ret;
+    }
+
+    return 0;
+}
+
 int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign)
 {
     struct kvm_ioeventfd kick = {
diff --git a/kvm.h b/kvm.h
index 65a4ee2..0f25d20 100644
--- a/kvm.h
+++ b/kvm.h
@@ -174,9 +174,16 @@  static inline void cpu_synchronize_post_init(CPUState *env)
 }
 
 #if defined(KVM_IOEVENTFD) && defined(CONFIG_KVM)
+int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign);
 int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign);
 #else
 static inline
+int kvm_set_ioeventfd_mmio_long(int fd, uint16_t adr, uint16_t val, bool assign)
+{
+    return -ENOSYS;
+}
+
+static inline
 int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign)
 {
     return -ENOSYS;