summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-10-22 01:05:58 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2020-10-22 01:05:58 +0300
commitc0623f5e5d21d65d08f6276ca4e64d470c833761 (patch)
tree5bc1f615341a08b0d2bd9af5a893ae65f8499f05 /tools
parenta4f1d94e6bc1b00c4efa9655ad14e0d49b8f1e37 (diff)
parente2e1a1c86bf32a8d7458b9024f518cf2434414c8 (diff)
downloadlinux-c0623f5e5d21d65d08f6276ca4e64d470c833761.tar.xz
Merge branch 'kvm-fixes' into 'next'
Pick up bugfixes from 5.9, otherwise various tests fail.
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/kvm/x86_64/debug_regs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/x86_64/debug_regs.c b/tools/testing/selftests/kvm/x86_64/debug_regs.c
index b8d14f9db5f9..2fc6b3af81a1 100644
--- a/tools/testing/selftests/kvm/x86_64/debug_regs.c
+++ b/tools/testing/selftests/kvm/x86_64/debug_regs.c
@@ -73,7 +73,7 @@ int main(void)
int i;
/* Instruction lengths starting at ss_start */
int ss_size[4] = {
- 3, /* xor */
+ 2, /* xor */
2, /* cpuid */
5, /* mov */
2, /* rdmsr */