Pull kvm fixes from Paolo Bonzini: - Check for invalid flags to KVM_CAP_X86_USER_SPACE_MSR - Fix use of sched_setaffinity in selftests - Sync kernel headers to tools - Fix KVM_STATS_UNIT_MAX * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: Protect the unused bits in MSR exiting flags tools headers UAPI: Sync linux/kvm.h with the kernel sources KVM: selftests: Fix target thread to be migrated in rseq_test KVM: stats: Fix value for KVM_STATS_UNIT_MAX for boolean stats
Showing the changes to include/uapi/linux (1 of 5 files). Show all
Unified · Split
| @@ -2084,7 +2084,7 @@ struct kvm_stats_header { · 2083 unmodified lines | |||
| 2084 | #define KVM_STATS_UNIT_SECONDS (0x2 << KVM_STATS_UNIT_SHIFT) | 2084 | #define KVM_STATS_UNIT_SECONDS (0x2 << KVM_STATS_UNIT_SHIFT) |
| 2085 | #define KVM_STATS_UNIT_CYCLES (0x3 << KVM_STATS_UNIT_SHIFT) | 2085 | #define KVM_STATS_UNIT_CYCLES (0x3 << KVM_STATS_UNIT_SHIFT) |
| 2086 | #define KVM_STATS_UNIT_BOOLEAN (0x4 << KVM_STATS_UNIT_SHIFT) | 2086 | #define KVM_STATS_UNIT_BOOLEAN (0x4 << KVM_STATS_UNIT_SHIFT) |
| 2087 | #define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_CYCLES | 2087 | #define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_BOOLEAN |
| 2088 | 2088 | ||
| 2089 | #define KVM_STATS_BASE_SHIFT 8 | 2089 | #define KVM_STATS_BASE_SHIFT 8 |
| 2090 | #define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT) | 2090 | #define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT) |