Skip to contentSkip to conversation

x86: Enable in-kernel irqchip before creating PIT

PATCH Applied Tengfei Yu 2 participants 2 messages Jan 29, 2024 – Feb 9, 2024 KVM

lore
Share & tools
lore

Tengfei Yu

author
#0 lore raw

PATCH 1/1 x86: Enable in-kernel irqchip before creating PIT

As the kvm api(https://docs.kernel.org/virt/kvm/api.html) reads, KVM_CREATE_PIT2 call is only valid after enabling in-kernel irqchip support via KVM_CREATE_IRQCHIP.

---
 x86/kvm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
x86/kvm.c +4 -4
index 328fa75..71ebb1e 100644
@@ -150,10 +150,6 @@ void kvm__arch_init(struct kvm *kvm)
 	if (ret < 0)
 		die_perror("KVM_SET_TSS_ADDR ioctl");
 
-	ret = ioctl(kvm->vm_fd, KVM_CREATE_PIT2, &pit_config);
-	if (ret < 0)
-		die_perror("KVM_CREATE_PIT2 ioctl");
-
 	if (ram_size < KVM_32BIT_GAP_START) {
 		kvm->ram_size = ram_size;
 		kvm->ram_start = mmap_anon_or_hugetlbfs(kvm, hugetlbfs_path, ram_size);
@@ -175,6 +171,10 @@ void kvm__arch_init(struct kvm *kvm)
 	ret = ioctl(kvm->vm_fd, KVM_CREATE_IRQCHIP);
 	if (ret < 0)
 		die_perror("KVM_CREATE_IRQCHIP ioctl");
+
+	ret = ioctl(kvm->vm_fd, KVM_CREATE_PIT2, &pit_config);
+	if (ret < 0)
+		die_perror("KVM_CREATE_PIT2 ioctl");
 }
 
 void kvm__arch_delete_ram(struct kvm *kvm)
Signature · 1 line
2.39.3