summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 12:56:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 12:56:17 -0800
commitb07d41b77e58baa2df2326cec68dde03cb2348c5 (patch)
tree80bf63803e52c4930dd0118046ab3d2f074d529f /Documentation
parent8fa4d8702de3b32854344635667290776d1a754b (diff)
parentb4329db0d7fd5a233866e799ad3bae8639e90c71 (diff)
downloadlinux-stable-b07d41b77e58baa2df2326cec68dde03cb2348c5.tar.gz
linux-stable-b07d41b77e58baa2df2326cec68dde03cb2348c5.tar.bz2
linux-stable-b07d41b77e58baa2df2326cec68dde03cb2348c5.zip
Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: get rid of kvm_create_vm() unused label warning on s390 KVM: powerpc: Fix mtsrin in book3s_64 mmu KVM: ia64: fix build breakage due to host spinlock change KVM: x86: Extend KVM_SET_VCPU_EVENTS with selective updates KVM: LAPIC: make sure IRR bitmap is scanned after vm load KVM: Fix possible circular locking in kvm_vm_ioctl_assign_device() KVM: MMU: remove prefault from invlpg handler
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kvm/api.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/kvm/api.txt b/Documentation/kvm/api.txt
index e1a114161027..2811e452f756 100644
--- a/Documentation/kvm/api.txt
+++ b/Documentation/kvm/api.txt
@@ -685,7 +685,7 @@ struct kvm_vcpu_events {
__u8 pad;
} nmi;
__u32 sipi_vector;
- __u32 flags; /* must be zero */
+ __u32 flags;
};
4.30 KVM_SET_VCPU_EVENTS
@@ -701,6 +701,14 @@ vcpu.
See KVM_GET_VCPU_EVENTS for the data structure.
+Fields that may be modified asynchronously by running VCPUs can be excluded
+from the update. These fields are nmi.pending and sipi_vector. Keep the
+corresponding bits in the flags field cleared to suppress overwriting the
+current in-kernel state. The bits are:
+
+KVM_VCPUEVENT_VALID_NMI_PENDING - transfer nmi.pending to the kernel
+KVM_VCPUEVENT_VALID_SIPI_VECTOR - transfer sipi_vector
+
5. The kvm_run structure