]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
accel/kvm: check for KVM_CAP_READONLY_MEM on VM
authorTom Dohrmann <erbse.13@gmx.de>
Tue, 3 Sep 2024 06:29:53 +0000 (06:29 +0000)
committerMichael Tokarev <mjt@tls.msk.ru>
Fri, 18 Oct 2024 16:03:08 +0000 (19:03 +0300)
KVM_CAP_READONLY_MEM used to be a global capability, but with the
introduction of AMD SEV-SNP confidential VMs, this extension is not
always available on all VM types [1,2].

Query the extension on the VM level instead of on the KVM level.

[1] https://patchwork.kernel.org/project/kvm/patch/20240809190319.1710470-2-seanjc@google.com/
[2] https://patchwork.kernel.org/project/kvm/patch/20240902144219.3716974-1-erbse.13@gmx.de/

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Tom Dohrmann <erbse.13@gmx.de>
Link: https://lore.kernel.org/r/20240903062953.3926498-1-erbse.13@gmx.de
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 64e0e63ea16aa0122dc0c41a0679da0ae4616208)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
accel/kvm/kvm-all.c

index 4db866f0caa3af226f42d66afff78c437658aefe..8c5e71f20cd811bc37c697e82281c5646625173d 100644 (file)
@@ -2660,7 +2660,7 @@ static int kvm_init(MachineState *ms)
     }
 
     kvm_readonly_mem_allowed =
-        (kvm_check_extension(s, KVM_CAP_READONLY_MEM) > 0);
+        (kvm_vm_check_extension(s, KVM_CAP_READONLY_MEM) > 0);
 
     kvm_resamplefds_allowed =
         (kvm_check_extension(s, KVM_CAP_IRQFD_RESAMPLE) > 0);