[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/24] kvm: i386: require KVM_CAP_SET_IDENTITY_MAP_ADDR
From: |
Paolo Bonzini |
Subject: |
[PULL 23/24] kvm: i386: require KVM_CAP_SET_IDENTITY_MAP_ADDR |
Date: |
Thu, 26 Oct 2023 01:27:16 +0200 |
This was introduced in KVM in Linux 2.6.32, we can require it unconditionally.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/kvm/kvm.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index d4bf327fa6f..e364b842e6d 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -99,6 +99,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_INFO(X86_ROBUST_SINGLESTEP),
KVM_CAP_INFO(MCE),
KVM_CAP_INFO(ADJUST_CLOCK),
+ KVM_CAP_INFO(SET_IDENTITY_MAP_ADDR),
KVM_CAP_LAST_INFO
};
@@ -2600,20 +2601,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
* In order to use vm86 mode, an EPT identity map and a TSS are needed.
* Since these must be part of guest physical memory, we need to allocate
* them, both by setting their start addresses in the kernel and by
- * creating a corresponding e820 entry. We need 4 pages before the BIOS.
- *
- * Older KVM versions may not support setting the identity map base. In
- * that case we need to stick with the default, i.e. a 256K maximum BIOS
- * size.
+ * creating a corresponding e820 entry. We need 4 pages before the BIOS,
+ * so this value allows up to 16M BIOSes.
*/
- if (kvm_check_extension(s, KVM_CAP_SET_IDENTITY_MAP_ADDR)) {
- /* Allows up to 16M BIOSes. */
- identity_base = 0xfeffc000;
-
- ret = kvm_vm_ioctl(s, KVM_SET_IDENTITY_MAP_ADDR, &identity_base);
- if (ret < 0) {
- return ret;
- }
+ identity_base = 0xfeffc000;
+ ret = kvm_vm_ioctl(s, KVM_SET_IDENTITY_MAP_ADDR, &identity_base);
+ if (ret < 0) {
+ return ret;
}
/* Set TSS base one page after EPT identity map. */
--
2.41.0
- [PULL 13/24] kvm: drop reference to KVM_CAP_PCI_2_3, (continued)
- [PULL 13/24] kvm: drop reference to KVM_CAP_PCI_2_3, Paolo Bonzini, 2023/10/25
- [PULL 09/24] kvm: require KVM_CAP_INTERNAL_ERROR_DATA, Paolo Bonzini, 2023/10/25
- [PULL 14/24] kvm: assume that many ioeventfds can be created, Paolo Bonzini, 2023/10/25
- [PULL 11/24] kvm: require KVM_IRQFD for kernel irqchip, Paolo Bonzini, 2023/10/25
- [PULL 15/24] kvm: require KVM_CAP_IOEVENTFD and KVM_CAP_IOEVENTFD_ANY_LENGTH, Paolo Bonzini, 2023/10/25
- [PULL 17/24] kvm: i386: move KVM_CAP_IRQ_ROUTING detection to kvm_arch_required_capabilities, Paolo Bonzini, 2023/10/25
- [PULL 18/24] kvm: i386: require KVM_CAP_DEBUGREGS, Paolo Bonzini, 2023/10/25
- [PULL 20/24] kvm: i386: require KVM_CAP_SET_VCPU_EVENTS and KVM_CAP_X86_ROBUST_SINGLESTEP, Paolo Bonzini, 2023/10/25
- [PULL 19/24] kvm: i386: require KVM_CAP_XSAVE, Paolo Bonzini, 2023/10/25
- [PULL 22/24] kvm: i386: require KVM_CAP_ADJUST_CLOCK, Paolo Bonzini, 2023/10/25
- [PULL 23/24] kvm: i386: require KVM_CAP_SET_IDENTITY_MAP_ADDR,
Paolo Bonzini <=
- [PULL 21/24] kvm: i386: require KVM_CAP_MCE, Paolo Bonzini, 2023/10/25
- [PULL 16/24] kvm: unify listeners for PIO address space, Paolo Bonzini, 2023/10/25
- [PULL 24/24] kvm: i8254: require KVM_CAP_PIT2 and KVM_CAP_PIT_STATE2, Paolo Bonzini, 2023/10/25