From patchwork Wed Mar 21 15:52:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V2,7/7] qed: remove incoming live migration blocker Date: Wed, 21 Mar 2012 05:52:04 -0000 From: Benoit Canet X-Patchwork-Id: 148022 Message-Id: <1332345124-381-8-git-send-email-benoit.canet@gmail.com> 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 {