diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-18 14:44:43 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-18 14:44:43 -0500 |
| commit | 09f06a6c603ce64284287d32f6ffadaaa5064850 (patch) | |
| tree | 176bbc325a87eb4961ec8605e75d326746e7c9bb /kvm.h | |
| parent | 513e6bde4fa551c293e7d346e27b618b57a4087a (diff) | |
| parent | 15b2bd1847239fe0b4a1041b69a631741d2e273a (diff) | |
| download | qemu-09f06a6c603ce64284287d32f6ffadaaa5064850.zip qemu-09f06a6c603ce64284287d32f6ffadaaa5064850.tar.gz qemu-09f06a6c603ce64284287d32f6ffadaaa5064850.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
virtio: move common irqfd handling out of virtio-pci
virtio: move common ioeventfd handling out of virtio-pci
event_notifier: add event_notifier_set_handler
memory: pass EventNotifier, not eventfd
ivshmem: wrap ivshmem_del_eventfd loops with transaction
ivshmem: use EventNotifier and memory API
event_notifier: add event_notifier_init_fd
event_notifier: remove event_notifier_test
event_notifier: add event_notifier_set
apic: Defer interrupt updates to VCPU thread
apic: Reevaluate pending interrupts on LVT_LINT0 changes
apic: Resolve potential endless loop around apic_update_irq
kvm: expose tsc deadline timer feature to guest
kvm_pv_eoi: add flag support
kvm: Don't abort on kvm_irqchip_add_msi_route()
Diffstat (limited to 'kvm.h')
| -rw-r--r-- | kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -220,4 +220,6 @@ 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); #endif |