| Message ID | 20230810153611.3410882-6-eperezma@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable vdpa net migration with features depending on CVQ | expand |
On Thu, Aug 10, 2023 at 11:36 PM Eugenio Pérez <eperezma@redhat.com> wrote: > > Now that we have add migration blockers if the device does not support > all the needed features, remove the general blocker applied to all net > devices with CVQ. > > Signed-off-by: Eugenio Pérez <eperezma@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Thanks > --- > net/vhost-vdpa.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c > index 3bf60f9431..6bb56f7d94 100644 > --- a/net/vhost-vdpa.c > +++ b/net/vhost-vdpa.c > @@ -1413,18 +1413,6 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer, > s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops; > s->vhost_vdpa.shadow_vq_ops_opaque = s; > s->cvq_isolated = cvq_isolated; > - > - /* > - * TODO: We cannot migrate devices with CVQ and no x-svq enabled as > - * there is no way to set the device state (MAC, MQ, etc) before > - * starting the datapath. > - * > - * Migration blocker ownership now belongs to s->vhost_vdpa. > - */ > - if (!svq) { > - error_setg(&s->vhost_vdpa.migration_blocker, > - "net vdpa cannot migrate with CVQ feature"); > - } > } > ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, nvqs); > if (ret) { > -- > 2.39.3 >
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 3bf60f9431..6bb56f7d94 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -1413,18 +1413,6 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer, s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops; s->vhost_vdpa.shadow_vq_ops_opaque = s; s->cvq_isolated = cvq_isolated; - - /* - * TODO: We cannot migrate devices with CVQ and no x-svq enabled as - * there is no way to set the device state (MAC, MQ, etc) before - * starting the datapath. - * - * Migration blocker ownership now belongs to s->vhost_vdpa. - */ - if (!svq) { - error_setg(&s->vhost_vdpa.migration_blocker, - "net vdpa cannot migrate with CVQ feature"); - } } ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, nvqs); if (ret) {
Now that we have add migration blockers if the device does not support all the needed features, remove the general blocker applied to all net devices with CVQ. Signed-off-by: Eugenio Pérez <eperezma@redhat.com> --- net/vhost-vdpa.c | 12 ------------ 1 file changed, 12 deletions(-)