diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2010-02-23 11:47:57 -0500 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-01 10:36:14 -0500 |
| commit | d2be1651b736002e0c76d7095d6c0ba77b4a897c (patch) | |
| tree | fbbf39d27d894ce9e6d2f57cc252893fc6195065 | |
| parent | c573cd22939e54fc1b8e672054a505048987a7cb (diff) | |
KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
This marks the guest single-step API improvement of 94fe45da and
91586a3b with a capability flag to allow reliable detection by user
space.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Cc: stable@kernel.org (2.6.33)
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 1 | ||||
| -rw-r--r-- | include/linux/kvm.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c3d2acbbb91b..e46282a56565 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -1570,6 +1570,7 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
| 1570 | case KVM_CAP_HYPERV_VAPIC: | 1570 | case KVM_CAP_HYPERV_VAPIC: |
| 1571 | case KVM_CAP_HYPERV_SPIN: | 1571 | case KVM_CAP_HYPERV_SPIN: |
| 1572 | case KVM_CAP_PCI_SEGMENT: | 1572 | case KVM_CAP_PCI_SEGMENT: |
| 1573 | case KVM_CAP_X86_ROBUST_SINGLESTEP: | ||
| 1573 | r = 1; | 1574 | r = 1; |
| 1574 | break; | 1575 | break; |
| 1575 | case KVM_CAP_COALESCED_MMIO: | 1576 | case KVM_CAP_COALESCED_MMIO: |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index dfa54be881f4..60df9c84ecae 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
| @@ -501,6 +501,7 @@ struct kvm_ioeventfd { | |||
| 501 | #define KVM_CAP_HYPERV_VAPIC 45 | 501 | #define KVM_CAP_HYPERV_VAPIC 45 |
| 502 | #define KVM_CAP_HYPERV_SPIN 46 | 502 | #define KVM_CAP_HYPERV_SPIN 46 |
| 503 | #define KVM_CAP_PCI_SEGMENT 47 | 503 | #define KVM_CAP_PCI_SEGMENT 47 |
| 504 | #define KVM_CAP_X86_ROBUST_SINGLESTEP 51 | ||
| 504 | 505 | ||
| 505 | #ifdef KVM_CAP_IRQ_ROUTING | 506 | #ifdef KVM_CAP_IRQ_ROUTING |
| 506 | 507 | ||
