|
 |
272dfe3 |
This adds API to set ioeventfd to kvm,
|
|
|
272dfe3 |
as well as stubs for non-eventfd case,
|
|
|
272dfe3 |
making it possible for users to use this API
|
|
|
272dfe3 |
without ifdefs.
|
|
|
272dfe3 |
|
|
|
272dfe3 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
272dfe3 |
---
|
|
|
272dfe3 |
kvm-all.c | 20 ++++++++++++++++++++
|
|
|
272dfe3 |
kvm.h | 16 ++++++++++++++++
|
|
|
272dfe3 |
2 files changed, 36 insertions(+), 0 deletions(-)
|
|
|
272dfe3 |
|
|
|
272dfe3 |
diff --git a/kvm-all.c b/kvm-all.c
|
|
|
272dfe3 |
index 0423fff..efdf40c 100644
|
|
|
272dfe3 |
--- a/kvm-all.c
|
|
|
272dfe3 |
+++ b/kvm-all.c
|
|
|
272dfe3 |
@@ -1102,4 +1102,24 @@ void kvm_remove_all_breakpoints(CPUState *current_env)
|
|
|
272dfe3 |
}
|
|
|
272dfe3 |
#endif /* !KVM_CAP_SET_GUEST_DEBUG */
|
|
|
272dfe3 |
|
|
|
272dfe3 |
+#ifdef KVM_IOEVENTFD
|
|
|
272dfe3 |
+int kvm_set_ioeventfd(uint16_t addr, uint16_t data, int fd, bool assigned)
|
|
|
272dfe3 |
+{
|
|
|
272dfe3 |
+ struct kvm_ioeventfd kick = {
|
|
|
272dfe3 |
+ .datamatch = data,
|
|
|
272dfe3 |
+ .addr = addr,
|
|
|
272dfe3 |
+ .len = 2,
|
|
|
272dfe3 |
+ .flags = KVM_IOEVENTFD_FLAG_DATAMATCH | KVM_IOEVENTFD_FLAG_PIO,
|
|
|
272dfe3 |
+ .fd = fd,
|
|
|
272dfe3 |
+ };
|
|
|
272dfe3 |
+ int r;
|
|
|
272dfe3 |
+ if (!assigned)
|
|
|
272dfe3 |
+ kick.flags |= KVM_IOEVENTFD_FLAG_DEASSIGN;
|
|
|
272dfe3 |
+ r = kvm_vm_ioctl(kvm_state, KVM_IOEVENTFD, &kick);
|
|
|
272dfe3 |
+ if (r < 0)
|
|
|
272dfe3 |
+ return r;
|
|
|
272dfe3 |
+ return 0;
|
|
|
272dfe3 |
+}
|
|
|
272dfe3 |
+#endif
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
#include "qemu-kvm.c"
|
|
|
272dfe3 |
diff --git a/kvm.h b/kvm.h
|
|
|
272dfe3 |
index 9fa4e25..e98b5c8 100644
|
|
|
272dfe3 |
--- a/kvm.h
|
|
|
272dfe3 |
+++ b/kvm.h
|
|
|
272dfe3 |
@@ -14,6 +14,8 @@
|
|
|
272dfe3 |
#ifndef QEMU_KVM_H
|
|
|
272dfe3 |
#define QEMU_KVM_H
|
|
|
272dfe3 |
|
|
|
272dfe3 |
+#include <stdbool.h>
|
|
|
272dfe3 |
+#include <errno.h>
|
|
|
272dfe3 |
#include "config.h"
|
|
|
272dfe3 |
#include "qemu-queue.h"
|
|
|
272dfe3 |
#include "qemu-kvm.h"
|
|
|
272dfe3 |
@@ -21,6 +23,10 @@
|
|
|
272dfe3 |
#ifdef KVM_UPSTREAM
|
|
|
272dfe3 |
|
|
|
272dfe3 |
#ifdef CONFIG_KVM
|
|
|
272dfe3 |
+#include <linux/kvm.h>
|
|
|
272dfe3 |
+#endif
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
+#ifdef CONFIG_KVM
|
|
|
272dfe3 |
extern int kvm_allowed;
|
|
|
272dfe3 |
|
|
|
272dfe3 |
#define kvm_enabled() (kvm_allowed)
|
|
|
272dfe3 |
@@ -151,4 +157,14 @@ static inline void cpu_synchronize_state(CPUState *env)
|
|
|
272dfe3 |
|
|
|
272dfe3 |
#endif
|
|
|
272dfe3 |
|
|
|
272dfe3 |
+#if defined(KVM_IOEVENTFD) && defined(CONFIG_KVM)
|
|
|
272dfe3 |
+int kvm_set_ioeventfd(uint16_t addr, uint16_t data, int fd, bool assigned);
|
|
|
272dfe3 |
+#else
|
|
|
272dfe3 |
+static inline
|
|
|
272dfe3 |
+int kvm_set_ioeventfd(uint16_t data, uint16_t addr, int fd, bool assigned)
|
|
|
272dfe3 |
+{
|
|
|
272dfe3 |
+ return -ENOSYS;
|
|
|
272dfe3 |
+}
|
|
|
272dfe3 |
+#endif
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
#endif
|
|
|
272dfe3 |
--
|
|
|
272dfe3 |
1.6.6.144.g5c3af
|