ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aneesh/for-upstream' into staging 

* aneesh/for-upstream:
  hw/9pfs: Fix assert when disabling migration
  configure: Fix build with capabilities
This commit is contained in:
Anthony Liguori 2012-08-03 13:50:41 -05:00
parent c8057f951d 4cdc0789ec
commit aeb01d5f2c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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);
/*
* 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; s->root_fid = fid;
/* disable migration */
error_set(&s->migration_blocker, QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION, error_set(&s->migration_blocker, QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION,
s->ctx.fs_root ? s->ctx.fs_root : "NULL", s->tag); s->ctx.fs_root ? s->ctx.fs_root : "NULL", s->tag);
migrate_add_blocker(s->migration_blocker); migrate_add_blocker(s->migration_blocker);
}
out: out:
put_fid(pdu, fidp); put_fid(pdu, fidp);
out_nofid: out_nofid: