diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-29 20:09:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-29 20:09:39 -0400 |
commit | 73bcc49959e4e40911dd0dd634bf1b353827df66 (patch) | |
tree | 6b0c1d440c490a65c51ab5cf5aee7095cb4089d3 /Documentation/virtual/kvm/api.txt | |
parent | 8447c4d15e357a458c9051ddc84aa6c8b9c27000 (diff) | |
parent | 28a33cbc24e4256c143dce96c7d93bf423229f92 (diff) |
Merge tag 'v3.5'
Linux 3.5
* tag 'v3.5': (1242 commits)
Linux 3.5
Remove SYSTEM_SUSPEND_DISK system state
kdb: Switch to nolock variants of kmsg_dump functions
printk: Implement some unlocked kmsg_dump functions
printk: Remove kdb_syslog_data
kdb: Revive dmesg command
dm raid1: set discard_zeroes_data_unsupported
dm thin: do not send discards to shared blocks
dm raid1: fix crash with mirror recovery and discard
pnfs-obj: Fix __r4w_get_page when offset is beyond i_size
pnfs-obj: don't leak objio_state if ore_write/read fails
ore: Unlock r4w pages in exact reverse order of locking
ore: Remove support of partial IO request (NFS crash)
ore: Fix NFS crash by supporting any unaligned RAID IO
UBIFS: fix a bug in empty space fix-up
cx25821: Remove bad strcpy to read-only char*
HID: hid-multitouch: add support for Zytronic panels
MIPS: PCI: Move fixups from __init to __devinit.
MIPS: Fix bug.h MIPS build regression
MIPS: sync-r4k: remove redundant irq operation
...
Diffstat (limited to 'Documentation/virtual/kvm/api.txt')
-rw-r--r-- | Documentation/virtual/kvm/api.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 930126698a0f..2c9948379469 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt | |||
@@ -1930,6 +1930,23 @@ The "pte_enc" field provides a value that can OR'ed into the hash | |||
1930 | PTE's RPN field (ie, it needs to be shifted left by 12 to OR it | 1930 | PTE's RPN field (ie, it needs to be shifted left by 12 to OR it |
1931 | into the hash PTE second double word). | 1931 | into the hash PTE second double word). |
1932 | 1932 | ||
1933 | 4.75 KVM_IRQFD | ||
1934 | |||
1935 | Capability: KVM_CAP_IRQFD | ||
1936 | Architectures: x86 | ||
1937 | Type: vm ioctl | ||
1938 | Parameters: struct kvm_irqfd (in) | ||
1939 | Returns: 0 on success, -1 on error | ||
1940 | |||
1941 | Allows setting an eventfd to directly trigger a guest interrupt. | ||
1942 | kvm_irqfd.fd specifies the file descriptor to use as the eventfd and | ||
1943 | kvm_irqfd.gsi specifies the irqchip pin toggled by this event. When | ||
1944 | an event is tiggered on the eventfd, an interrupt is injected into | ||
1945 | the guest using the specified gsi pin. The irqfd is removed using | ||
1946 | the KVM_IRQFD_FLAG_DEASSIGN flag, specifying both kvm_irqfd.fd | ||
1947 | and kvm_irqfd.gsi. | ||
1948 | |||
1949 | |||
1933 | 5. The kvm_run structure | 1950 | 5. The kvm_run structure |
1934 | ------------------------ | 1951 | ------------------------ |
1935 | 1952 | ||