OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/9pfs: Fix assert when disabling migration

Browse Source 
For 9p we can get the attach request multiple times for the
same export. So don't adding migration blocker for every
attach request.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
Aneesh Kumar K.V 2012-07-31 12:53:18 +05:30
parent b7d28d25fd
commit 4cdc0789ec
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/9pfs/virtio-9p.c
View File

@ -983,11 +983,16 @@ static void v9fs_attach(void *opaque)
err += offset; err += offset;
trace_v9fs_attach_return(pdu->tag, pdu->id, trace_v9fs_attach_return(pdu->tag, pdu->id,
qid.type, qid.version, qid.path); qid.type, qid.version, qid.path);
s->root_fid = fid; /*
/* disable migration */ * disable migration if we haven't done already.
error_set(&s->migration_blocker, QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION, * attach could get called multiple times for the same export.
s->ctx.fs_root ? s->ctx.fs_root : "NULL", s->tag); */
migrate_add_blocker(s->migration_blocker); 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: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid: