Signed-off-by: Benoit Canet <ben...@irqsave.net>
---
hw/9pfs/virtio-9p-device.c | 2 --
hw/9pfs/virtio-9p.c | 23 -----------------------
hw/9pfs/virtio-9p.h | 2 --
3 files changed, 27 deletions(-)
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 02b8630..f91a9b8 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -86,7 +86,6 @@ static void virtio_9p_save(QEMUFile *f, void *opaque)
qemu_put_be32(f, s->proto_version);
qemu_put_be32(f, s->msize);
- qemu_put_be32(f, s->root_fid);
}
static void virtio_9p_load_path(QEMUFile *f, V9fsPath *path)
@@ -160,7 +159,6 @@ static int virtio_9p_load(QEMUFile *f, void *opaque, int
version_id)
s->proto_version = qemu_get_be32(f);
s->msize = qemu_get_be32(f);
- s->root_fid = qemu_get_be32(f);
return 0;
}
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 3bf3ee4..b46924f 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -399,19 +399,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;
@@ -1048,16 +1035,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_set(&s->migration_blocker, QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION,
- 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 4d16d46..94d6f76 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -223,8 +223,6 @@ typedef struct V9fsState
* on rename.
*/
CoRwlock rename_lock;
- int32_t root_fid;
- Error *migration_blocker;
} V9fsState;
typedef struct V9fsStatState {
--
1.7.10.4
