From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yGD-0001US-7l for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4yFl-000569-HR for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:16 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yFl-00053f-9D for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:32:49 -0500 Received: by mail-ww0-f53.google.com with SMTP id fm10so3536275wgb.10 for ; Tue, 06 Mar 2012 09:32:48 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 6 Mar 2012 18:32:29 +0100 Message-Id: <1331055149-10982-11-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> References: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [RFC PATCH 10/10] qed: remove incoming live migration blocker List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com, wolf@redhat.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 4bfda24..a7964f0 100644 --- a/block/qed.c +++ b/block/qed.c @@ -511,12 +511,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); @@ -529,9 +523,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 62624a1..c716772 100644 --- a/block/qed.h +++ b/block/qed.h @@ -169,8 +169,6 @@ typedef struct { /* Periodic flush and clear need check flag */ QEMUTimer *need_check_timer; - - Error *migration_blocker; } BDRVQEDState; enum { -- 1.7.7.6