From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SANpl-0007k6-3n for qemu-devel@nongnu.org; Wed, 21 Mar 2012 11:52:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SANpe-00034F-Mp for qemu-devel@nongnu.org; Wed, 21 Mar 2012 11:52:20 -0400 Received: from mail-wg0-f53.google.com ([74.125.82.53]:39712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SANpe-00033h-Dv for qemu-devel@nongnu.org; Wed, 21 Mar 2012 11:52:14 -0400 Received: by wgbfm10 with SMTP id fm10so755880wgb.10 for ; Wed, 21 Mar 2012 08:52:12 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 21 Mar 2012 16:52:04 +0100 Message-Id: <1332345124-381-8-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1332345124-381-1-git-send-email-benoit.canet@gmail.com> References: <1332345124-381-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [PATCH V2 7/7] qed: remove incoming live migration blocker List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com Signed-off-by: Benoit Canet --- 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 4c04bc9..803a6c2 100644 --- a/block/qed.c +++ b/block/qed.c @@ -502,12 +502,6 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) s->need_check_timer = qemu_new_timer_ns(vm_clock, qed_need_check_timer_cb, s); - 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); @@ -520,9 +514,6 @@ static void bdrv_qed_close(BlockDriverState *bs) { BDRVQEDState *s = bs->opaque; - migrate_del_blocker(s->migration_blocker); - error_free(s->migration_blocker); - qed_cancel_need_check_timer(s); qemu_free_timer(s->need_check_timer); diff --git a/block/qed.h b/block/qed.h index cb1ebd8..9fac300 100644 --- a/block/qed.h +++ b/block/qed.h @@ -170,8 +170,6 @@ typedef struct { /* Periodic flush and clear need check flag */ QEMUTimer *need_check_timer; - - Error *migration_blocker; } BDRVQEDState; enum { -- 1.7.7.6