summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jones2020-10-01 08:17:13 +0200
committerPeter Maydell2020-10-08 16:24:32 +0200
commit94c7fefcb456b0b26f04b30e6df54a0c872e862d (patch)
tree86a8299418f0e2b6914550e241e026171f427c8b
parenthw/char/bcm2835_aux: Allow less than 32-bit accesses (diff)
downloadqemu-94c7fefcb456b0b26f04b30e6df54a0c872e862d.tar.gz
qemu-94c7fefcb456b0b26f04b30e6df54a0c872e862d.tar.xz
qemu-94c7fefcb456b0b26f04b30e6df54a0c872e862d.zip
linux headers: sync to 5.9-rc7
Update against Linux 5.9-rc7. Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Andrew Jones <drjones@redhat.com> Message-id: 20201001061718.101915-2-drjones@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--linux-headers/linux/kvm.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index 6683e2e1b0..43580c767c 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt {
#define KVM_VM_PPC_HV 1
#define KVM_VM_PPC_PR 2
-/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */
-#define KVM_VM_MIPS_TE 0
+/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
+#define KVM_VM_MIPS_AUTO 0
#define KVM_VM_MIPS_VZ 1
+#define KVM_VM_MIPS_TE 2
#define KVM_S390_SIE_PAGE_OFFSET 1
@@ -1035,6 +1036,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_LAST_CPU 184
#define KVM_CAP_SMALLER_MAXPHYADDR 185
#define KVM_CAP_S390_DIAG318 186
+#define KVM_CAP_STEAL_TIME 187
#ifdef KVM_CAP_IRQ_ROUTING