From b06a0314cd2a200c0d7ee805bd30f487106c923e Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 31 Aug 2010 02:03:32 +0200
Subject: [PATCH] --- yaml --- r: 215851 b: refs/heads/master c:
 6f7a2bd41fa8d52cbf5f32fdf8ba659d4ce4ae59 h: refs/heads/master i:   215849:
 c49eed35375b713e16cfaea156906fc4e28bf791   215847:
 d5646273f7c9e564646fa34c553e0e8468186e2f v: v3

---
 [refs]                          |  2 +-
 trunk/Documentation/kvm/api.txt | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b9cd752a7e7..a882ccb27ff4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5335f17651de5075313524ccc3881527268966f
+refs/heads/master: 6f7a2bd41fa8d52cbf5f32fdf8ba659d4ce4ae59
diff --git a/trunk/Documentation/kvm/api.txt b/trunk/Documentation/kvm/api.txt
index 44d9893f9db1..24d634128746 100644
--- a/trunk/Documentation/kvm/api.txt
+++ b/trunk/Documentation/kvm/api.txt
@@ -320,13 +320,13 @@ struct kvm_translation {
 4.15 KVM_INTERRUPT
 
 Capability: basic
-Architectures: x86
+Architectures: x86, ppc
 Type: vcpu ioctl
 Parameters: struct kvm_interrupt (in)
 Returns: 0 on success, -1 on error
 
 Queues a hardware interrupt vector to be injected.  This is only
-useful if in-kernel local APIC is not used.
+useful if in-kernel local APIC or equivalent is not used.
 
 /* for KVM_INTERRUPT */
 struct kvm_interrupt {
@@ -334,8 +334,37 @@ struct kvm_interrupt {
 	__u32 irq;
 };
 
+X86:
+
 Note 'irq' is an interrupt vector, not an interrupt pin or line.
 
+PPC:
+
+Queues an external interrupt to be injected. This ioctl is overleaded
+with 3 different irq values:
+
+a) KVM_INTERRUPT_SET
+
+  This injects an edge type external interrupt into the guest once it's ready
+  to receive interrupts. When injected, the interrupt is done.
+
+b) KVM_INTERRUPT_UNSET
+
+  This unsets any pending interrupt.
+
+  Only available with KVM_CAP_PPC_UNSET_IRQ.
+
+c) KVM_INTERRUPT_SET_LEVEL
+
+  This injects a level type external interrupt into the guest context. The
+  interrupt stays pending until a specific ioctl with KVM_INTERRUPT_UNSET
+  is triggered.
+
+  Only available with KVM_CAP_PPC_IRQ_LEVEL.
+
+Note that any value for 'irq' other than the ones stated above is invalid
+and incurs unexpected behavior.
+
 4.16 KVM_DEBUG_GUEST
 
 Capability: basic