]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw/arm/arm_gicv3_kvm: Add a migration blocker with kvm nested virt
authorEric Auger <eric.auger@redhat.com>
Mon, 7 Jul 2025 16:40:30 +0000 (18:40 +0200)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 10 Jul 2025 10:41:15 +0000 (11:41 +0100)
We may be miss some NV related GIC register save/restore. Until
we complete the study, let's add a migration blocker when the
maintenance IRQ is set.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Message-id: 20250707164129.1167837-5-eric.auger@redhat.com
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/intc/arm_gicv3_kvm.c

index b30aac7aee19229ed3aa380a87e8d63f42eb0e39..8ed88e742994b2826c38be9f48349ecc206a57ef 100644 (file)
@@ -827,8 +827,16 @@ static void kvm_arm_gicv3_realize(DeviceState *dev, Error **errp)
     }
 
     if (s->maint_irq) {
+        Error *kvm_nv_migration_blocker = NULL;
         int ret;
 
+        error_setg(&kvm_nv_migration_blocker,
+                   "Live migration disabled because KVM nested virt is enabled");
+        if (migrate_add_blocker(&kvm_nv_migration_blocker, errp)) {
+            error_free(kvm_nv_migration_blocker);
+            return;
+        }
+
         ret = kvm_device_check_attr(s->dev_fd,
                                     KVM_DEV_ARM_VGIC_GRP_MAINT_IRQ, 0);
         if (!ret) {