From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXXJx-0001eG-Kc for qemu-devel@nongnu.org; Fri, 26 Sep 2014 11:20:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXXJl-0007IH-Qc for qemu-devel@nongnu.org; Fri, 26 Sep 2014 11:20:33 -0400 Received: from mail-we0-x22d.google.com ([2a00:1450:400c:c03::22d]:34628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXXJl-0007Gi-Kv for qemu-devel@nongnu.org; Fri, 26 Sep 2014 11:20:21 -0400 Received: by mail-we0-f173.google.com with SMTP id p10so286963wes.32 for ; Fri, 26 Sep 2014 08:20:15 -0700 (PDT) Received: from localhost.localdomain (46-117-193-125.bb.netvision.net.il. [46.117.193.125]) by mx.google.com with ESMTPSA id mz16sm2558506wic.13.2014.09.26.08.20.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Sep 2014 08:20:15 -0700 (PDT) From: Boris Sukholitko Date: Fri, 26 Sep 2014 18:19:57 +0300 Message-Id: <1411744797-17121-3-git-send-email-boriss@gmail.com> In-Reply-To: <1411744797-17121-1-git-send-email-boriss@gmail.com> References: <1411744797-17121-1-git-send-email-boriss@gmail.com> Subject: [Qemu-devel] [PATCH 2/2] virtio-9p: Remove migration blockers. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Boris Sukholitko --- 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