Messages in this thread Patch in this message | | | From | Vitaly Kuznetsov <> | Subject | [PATCH v2 5/7] x86/kvm/hyper-v: Drop KVM_CAP_HYPERV_STIMER_DIRECT | Date | Mon, 10 Dec 2018 18:21:57 +0100 |
| |
The newly introduced KVM_GET_SUPPORTED_HV_CPUID covers Direct Mode stimers feature so we can drop KVM_CAP_HYPERV_STIMER_DIRECT and reuse its number.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> --- - This patch only makes sense befor 4.21 merge window, disregard if it doesn't make it in time. --- arch/x86/kvm/x86.c | 1 - include/uapi/linux/kvm.h | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 142776435166..67ba42929c11 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2997,7 +2997,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_HYPERV_TLBFLUSH: case KVM_CAP_HYPERV_SEND_IPI: case KVM_CAP_HYPERV_ENLIGHTENED_VMCS: - case KVM_CAP_HYPERV_STIMER_DIRECT: case KVM_CAP_HYPERV_CPUID: case KVM_CAP_PCI_SEGMENT: case KVM_CAP_DEBUGREGS: diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 9d0038eae002..a9121c9bada5 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -975,8 +975,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163 #define KVM_CAP_EXCEPTION_PAYLOAD 164 #define KVM_CAP_ARM_VM_IPA_SIZE 165 -#define KVM_CAP_HYPERV_STIMER_DIRECT 166 -#define KVM_CAP_HYPERV_CPUID 167 +#define KVM_CAP_HYPERV_CPUID 166 #ifdef KVM_CAP_IRQ_ROUTING -- 2.19.2
| |