From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: "Eugenio Pérez" <eperezma@redhat.com>,
"Jason Wang" <jasowang@redhat.com>
Subject: [PULL 19/21] vdpa: Delete CVQ migration blocker
Date: Fri, 2 Sep 2022 14:41:36 +0800 [thread overview]
Message-ID: <20220902064138.56468-20-jasowang@redhat.com> (raw)
In-Reply-To: <20220902064138.56468-1-jasowang@redhat.com>
From: Eugenio Pérez <eperezma@redhat.com>
We can restore the device state in the destination via CVQ now. Remove
the migration blocker.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/virtio/vhost-vdpa.c | 15 ---------------
include/hw/virtio/vhost-vdpa.h | 1 -
net/vhost-vdpa.c | 2 --
3 files changed, 18 deletions(-)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 23ae5ef..7468e44 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -1033,13 +1033,6 @@ static bool vhost_vdpa_svqs_start(struct vhost_dev *dev)
return true;
}
- if (v->migration_blocker) {
- int r = migrate_add_blocker(v->migration_blocker, &err);
- if (unlikely(r < 0)) {
- return false;
- }
- }
-
for (i = 0; i < v->shadow_vqs->len; ++i) {
VirtQueue *vq = virtio_get_queue(dev->vdev, dev->vq_index + i);
VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i);
@@ -1082,10 +1075,6 @@ err:
vhost_svq_stop(svq);
}
- if (v->migration_blocker) {
- migrate_del_blocker(v->migration_blocker);
- }
-
return false;
}
@@ -1101,10 +1090,6 @@ static void vhost_vdpa_svqs_stop(struct vhost_dev *dev)
VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i);
vhost_vdpa_svq_unmap_rings(dev, svq);
}
-
- if (v->migration_blocker) {
- migrate_del_blocker(v->migration_blocker);
- }
}
static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
index d10a893..1111d85 100644
--- a/include/hw/virtio/vhost-vdpa.h
+++ b/include/hw/virtio/vhost-vdpa.h
@@ -35,7 +35,6 @@ typedef struct vhost_vdpa {
bool shadow_vqs_enabled;
/* IOVA mapping used by the Shadow Virtqueue */
VhostIOVATree *iova_tree;
- Error *migration_blocker;
GPtrArray *shadow_vqs;
const VhostShadowVirtqueueOps *shadow_vq_ops;
void *shadow_vq_ops_opaque;
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 640434d..6ce68fc 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -555,8 +555,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;
- error_setg(&s->vhost_vdpa.migration_blocker,
- "Migration disabled: vhost-vdpa uses CVQ.");
}
ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, nvqs);
if (ret) {
--
2.7.4
next prev parent reply other threads:[~2022-09-02 7:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-02 6:41 [PULL 00/21] Net patches Jason Wang
2022-09-02 6:41 ` [PULL 01/21] vdpa: Skip the maps not in the iova tree Jason Wang
2022-09-02 6:41 ` [PULL 02/21] vdpa: do not save failed dma maps in SVQ " Jason Wang
2022-09-02 6:41 ` [PULL 03/21] util: accept iova_tree_remove_parameter by value Jason Wang
2022-09-02 6:41 ` [PULL 04/21] vdpa: Remove SVQ vring from iova_tree at shutdown Jason Wang
2022-09-02 6:41 ` [PULL 05/21] vdpa: Make SVQ vring unmapping return void Jason Wang
2022-09-02 6:41 ` [PULL 06/21] vhost: Always store new kick fd on vhost_svq_set_svq_kick_fd Jason Wang
2022-09-02 6:41 ` [PULL 07/21] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring Jason Wang
2022-09-02 6:41 ` [PULL 08/21] vhost: stop transfer elem ownership in vhost_handle_guest_kick Jason Wang
2022-09-02 6:41 ` [PULL 09/21] vhost: use SVQ element ndescs instead of opaque data for desc validation Jason Wang
2022-09-02 6:41 ` [PULL 10/21] vhost: Delete useless read memory barrier Jason Wang
2022-09-02 6:41 ` [PULL 11/21] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush Jason Wang
2022-09-02 6:41 ` [PULL 12/21] vhost_net: Add NetClientInfo start callback Jason Wang
2022-09-02 6:41 ` [PULL 13/21] vhost_net: Add NetClientInfo stop callback Jason Wang
2022-09-02 6:41 ` [PULL 14/21] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo Jason Wang
2022-09-02 6:41 ` [PULL 15/21] vdpa: Move command buffers map to start of net device Jason Wang
2022-09-02 6:41 ` [PULL 16/21] vdpa: extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail Jason Wang
2022-09-02 6:41 ` [PULL 17/21] vhost_net: add NetClientState->load() callback Jason Wang
2022-09-02 6:41 ` [PULL 18/21] vdpa: Add virtio-net mac address via CVQ at start Jason Wang
2022-09-02 6:41 ` Jason Wang [this message]
2022-09-02 6:41 ` [PULL 20/21] net/colo.c: Fix the pointer issue reported by Coverity Jason Wang
2022-09-02 6:41 ` [PULL 21/21] net: tulip: Restrict DMA engine to memories Jason Wang
2022-09-02 20:33 ` [PULL 00/21] Net patches Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220902064138.56468-20-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=eperezma@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).