Commit aeb01d5f authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

* aneesh/for-upstream:
  hw/9pfs: Fix assert when disabling migration
  configure: Fix build with capabilities
parents c8057f95 4cdc0789

hw/9pfs/virtio-9p.c

+10 −5
Original line number Diff line number Diff line
@@ -983,11 +983,16 @@ 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;

    /* disable migration */

        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: