diff options
| author | Anthony Liguori | 2013-08-30 00:21:51 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-08-30 00:21:51 +0200 |
| commit | b5d54bd42158b90b239bb6ce9c13072eb3a53fd2 (patch) | |
| tree | a4c6db6a9ee012c4873ff7dee67e2e63b32aa7b6 /include | |
| parent | Merge remote-tracking branch 'sweil/mingw' into stable-1.5 (diff) | |
| parent | kvm-stub: fix compilation (diff) | |
| download | qemu-b5d54bd42158b90b239bb6ce9c13072eb3a53fd2.tar.gz qemu-b5d54bd42158b90b239bb6ce9c13072eb3a53fd2.tar.xz qemu-b5d54bd42158b90b239bb6ce9c13072eb3a53fd2.zip | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5
* qemu-kvm/uq/master:
kvm-stub: fix compilation
kvm: shorten the parameter list for get_real_device()
kvm: i386: fix LAPIC TSC deadline timer save/restore
kvm-all.c: max_cpus should not exceed KVM vcpu limit
kvm: Simplify kvm_handle_io
kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled
kvm: add KVM_IRQFD_FLAG_RESAMPLE support
kvm: migrate vPMU state
target-i386: remove tabs from target-i386/cpu.h
Initialize IA32_FEATURE_CONTROL MSR in reset and migration
Conflicts:
target-i386/cpu.h
target-i386/kvm.c
aliguori: fixup trivial conflicts due to whitespace and added cpu
argument
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/kvm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index de74411f41..8e7668524b 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -309,7 +309,8 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg); int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg); void kvm_irqchip_release_virq(KVMState *s, int virq); -int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n, int virq); +int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n, + EventNotifier *rn, int virq); int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq); void kvm_pc_gsi_handler(void *opaque, int n, int level); void kvm_pc_setup_irq_routing(bool pci_enabled); |