From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFowt-0004Zs-QY for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:50:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFowk-0007Es-NP for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:50:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFowk-0007BJ-DY for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:50:02 -0400 From: Kevin Wolf Date: Thu, 5 Apr 2012 17:52:24 +0200 Message-Id: <1333641144-13612-47-git-send-email-kwolf@redhat.com> In-Reply-To: <1333641144-13612-1-git-send-email-kwolf@redhat.com> References: <1333641144-13612-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 46/46] qed: remove incoming live migration blocker List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Beno=C3=AEt Canet Signed-off-by: Benoit Canet Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/qed.c | 9 --------- block/qed.h | 2 -- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/block/qed.c b/block/qed.c index aea2772..366cde7 100644 --- a/block/qed.c +++ b/block/qed.c @@ -498,12 +498,6 @@ static int bdrv_qed_open(BlockDriverState *bs, int f= lags) s->need_check_timer =3D qemu_new_timer_ns(vm_clock, qed_need_check_timer_cb, s); =20 - error_set(&s->migration_blocker, - QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, - "qed", bs->device_name, "live migration"); - migrate_add_blocker(s->migration_blocker); - - out: if (ret) { qed_free_l2_cache(&s->l2_cache); @@ -516,9 +510,6 @@ static void bdrv_qed_close(BlockDriverState *bs) { BDRVQEDState *s =3D bs->opaque; =20 - migrate_del_blocker(s->migration_blocker); - error_free(s->migration_blocker); - qed_cancel_need_check_timer(s); qemu_free_timer(s->need_check_timer); =20 diff --git a/block/qed.h b/block/qed.h index 62624a1..c716772 100644 --- a/block/qed.h +++ b/block/qed.h @@ -169,8 +169,6 @@ typedef struct { =20 /* Periodic flush and clear need check flag */ QEMUTimer *need_check_timer; - - Error *migration_blocker; } BDRVQEDState; =20 enum { --=20 1.7.6.5