From 4a79b3c07dca4f1e21e4dbb1e59bf437b2a814fa Mon Sep 17 00:00:00 2001
From: fangyi <eric.fangyi@huawei.com>
Date: Tue, 29 Oct 2024 19:58:14 +0800
Subject: [PATCH 5/6] Revert "vdpa: block migration if SVQ does not admit a
 feature"

Use a new scheme instead for kernel vdpa, So revert it.

This reverts commit 57ac831865e370012496fb581a38d261cb72c5d0.
---
 hw/virtio/vhost-vdpa.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index bb3320946d..69cf3b76e9 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -596,21 +596,6 @@ static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque, Error **errp)
         return 0;
     }
 
-    /*
-     * If dev->shadow_vqs_enabled at initialization that means the device has
-     * been started with x-svq=on, so don't block migration
-     */
-    if (dev->migration_blocker == NULL && !v->shadow_vqs_enabled) {
-        /* We don't have dev->features yet */
-        uint64_t features;
-        ret = vhost_vdpa_get_dev_features(dev, &features);
-        if (unlikely(ret)) {
-            error_setg_errno(errp, -ret, "Could not get device features");
-            return ret;
-        }
-        vhost_svq_valid_features(features, &dev->migration_blocker);
-    }
-
     /*
      * Similar to VFIO, we end up pinning all guest memory and have to
      * disable discarding of RAM.
-- 
2.43.0