Previous to this patch the only way CVQ would be shadowed is if it does
support to isolate CVQ group or if all vqs were shadowed from the
beginning.  The second condition was checked at the beginning, and no
more configuration was done.

After this series we need to check if data queues are shadowed because
they are in the middle of the migration.  As checking if they are
shadowed already covers the previous case, let's just mimic it.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 net/vhost-vdpa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 9795306742..a772540250 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -505,7 +505,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
 
     s0 = vhost_vdpa_net_first_nc_vdpa(s);
     v->shadow_data = s0->vhost_vdpa.shadow_vqs_enabled;
-    v->shadow_vqs_enabled = s->always_svq;
+    v->shadow_vqs_enabled = s0->vhost_vdpa.shadow_vqs_enabled;
     s->vhost_vdpa.address_space_id = VHOST_VDPA_GUEST_PA_ASID;
 
     if (s->vhost_vdpa.shadow_data) {
-- 
2.39.3

On Thu, Aug 10, 2023 at 11:36 PM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> Previous to this patch the only way CVQ would be shadowed is if it does
> support to isolate CVQ group or if all vqs were shadowed from the
> beginning.  The second condition was checked at the beginning, and no
> more configuration was done.
>
> After this series we need to check if data queues are shadowed because
> they are in the middle of the migration.  As checking if they are
> shadowed already covers the previous case, let's just mimic it.
>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

Acked-by: Jason Wang <jasowang@redhat.com>

Thanks

> ---
>  net/vhost-vdpa.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index 9795306742..a772540250 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -505,7 +505,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
>
>      s0 = vhost_vdpa_net_first_nc_vdpa(s);
>      v->shadow_data = s0->vhost_vdpa.shadow_vqs_enabled;
> -    v->shadow_vqs_enabled = s->always_svq;
> +    v->shadow_vqs_enabled = s0->vhost_vdpa.shadow_vqs_enabled;
>      s->vhost_vdpa.address_space_id = VHOST_VDPA_GUEST_PA_ASID;
>
>      if (s->vhost_vdpa.shadow_data) {
> --
> 2.39.3
>