diff options
| author | Benoît Canet <benoit.canet@gmail.com> | 2012-03-23 08:36:54 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-04-05 16:29:12 +0200 |
| commit | 50d30c267563bf492fd403dd23abc7888f3e220c (patch) | |
| tree | b816cbb7adb1ed0a8194a05c0bff412fc16fa821 /block | |
| parent | 2d1f3c2360053dec7dacc0292f52cff17104feff (diff) | |
| download | qemu-50d30c267563bf492fd403dd23abc7888f3e220c.zip qemu-50d30c267563bf492fd403dd23abc7888f3e220c.tar.gz qemu-50d30c267563bf492fd403dd23abc7888f3e220c.tar.bz2 | |
qed: remove incoming live migration blocker
Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qed.c | 9 | ||||
| -rw-r--r-- | 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 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); @@ -516,9 +510,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 { |