From patchwork Wed Mar 21 15:52:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 148022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AF5C8B6EE7 for ; Thu, 22 Mar 2012 02:56:35 +1100 (EST) Received: from localhost ([::1]:45254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SANqi-0001uW-R3 for incoming@patchwork.ozlabs.org; Wed, 21 Mar 2012 11:53:20 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=LFnCHBlS2GSaTtvuLApsPjy2m/m0S6nye56HDVzzqaM=; b=luwbZevw9ZrGxhMm0oYr88xeCc3EdryyYx8ANbDd+vh1xiqyqpusjIvWAd4JNqTrXb PlHTsX0D8nJHShPwMIdAJCEQy+OltH1Am1G1rrpoNYOS/6whSVZTR1EaS3SWKS759k+5 /trG5BCA5mHAjbN8JiZ/u0Zs51UMhiA7POQHtzZgrju5ZGzlhYjC+xShMv63bsXbQxrL W7o53b1MFfqRKSW12HD3bN56WffDeP2EcPi5DFFhpVvpg4++dL4Plle0MlQccKpBwmDd AWWWr8V6/b4otC0F4u8kX7qMk2sO/Dz79HEkzZpMaLen0aky2Pupxkfp0zFliEDxzNMU h12A== Received: by 10.180.88.164 with SMTP id bh4mr39030488wib.22.1332345132345; Wed, 21 Mar 2012 08:52:12 -0700 (PDT) Received: from Laure.box.in.chocolate-blue.net ([109.190.18.76]) by mx.google.com with ESMTPS id k6sm5430352wiy.7.2012.03.21.08.52.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Mar 2012 08:52:12 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 21 Mar 2012 16:52:04 +0100 Message-Id: <1332345124-381-8-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1332345124-381-1-git-send-email-benoit.canet@gmail.com> References: <1332345124-381-1-git-send-email-benoit.canet@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.53 Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH V2 7/7] qed: remove incoming live migration blocker X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 {