Signed-off-by: Boris Sukholitko <bor...@gmail.com>
---
hw/9pfs/virtio-9p.c | 24 ------------------------
hw/9pfs/virtio-9p.h | 2 --
2 files changed, 26 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 5861a5b..2bf3c0a 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -332,19 +332,6 @@ static int put_fid(V9fsPDU *pdu, V9fsFidState *fidp)
* Don't free the fid if it is in reclaim list
*/
if (!fidp->ref && fidp->clunked) {
- if (fidp->fid == pdu->s->root_fid) {
- /*
- * if the clunked fid is root fid then we
- * have unmounted the fs on the client side.
- * delete the migration blocker. Ideally, this
- * should be hooked to transport close notification
- */
- if (pdu->s->migration_blocker) {
- migrate_del_blocker(pdu->s->migration_blocker);
- error_free(pdu->s->migration_blocker);
- pdu->s->migration_blocker = NULL;
- }
- }
return free_fid(pdu, fidp);
}
return 0;
@@ -979,17 +966,6 @@ static void v9fs_attach(void *opaque)
err += offset;
trace_v9fs_attach_return(pdu->tag, pdu->id,
qid.type, qid.version, qid.path);
- /*
- * disable migration if we haven't done already.
- * attach could get called multiple times for the same export.
- */
- if (!s->migration_blocker) {
- s->root_fid = fid;
- error_setg(&s->migration_blocker,
- "Migration is disabled when VirtFS export path '%s' is
mounted in the guest using mount_tag '%s'",
- s->ctx.fs_root ? s->ctx.fs_root : "NULL", s->tag);
- migrate_add_blocker(s->migration_blocker);
- }
out:
put_fid(pdu, fidp);
out_nofid:
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 2c3603a..23f8eba 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -222,8 +222,6 @@ typedef struct V9fsState
* on rename.
*/
CoRwlock rename_lock;
- int32_t root_fid;
- Error *migration_blocker;
V9fsConf fsconf;
} V9fsState;
--
2.0.2
